* 'master' of https://github.com/mediaburst/hackathon-starter:
Update README.md
Using the newest clockwork npm package
Removed commentted out lines from clockwork.jade
Tweak to the clockwork view
Adding clockwork SMS to the API mix
Conflicts:
controllers/api.js
package.json
* dstroot-reset: (27 commits)
Added comments to User model on instance methods and mongoose middleware.
Updated login template
Add success flash notification on successful password reset
Forgot password token changed to hex instead of base64 to avoid having slashes in the url
Merged first and second waterfall steps into one, added var secrets = require('../config/secrets');, and mongoose query now returns a user object instead of an array
Converted reset controller from eventemitter to async.waterfall.
Added callback to async.waterfall for error handling via express middleware
Renamed forgot password link
Updated reset password template
Cleaned up and refactored reset password template
Updated schema's default values for password token and expires fields
Update flash message on successful forgot password request
Update contributing section
Update POST /forgot description.
Refactor Forgot controller
Converted workflow/eventemitter code to async.waterfall
Update error flash message, redirect to /forgot if no reset token is found or if it has expired
Updated expiration of password token to 1hr, updated flash message when email is sent with password recovery instructions.
Removed user _id from reset route. Use only token value. It's random enough that you don't need to include user id as well.
Updated email template text, removed token salting, changed token to base64 (24bit)
...
* leemunroe-add-mailgun:
Removed sendgrid image logo
JavaScript style formatting. SendGrid as a default service for contact form.
Add Nodemailer and Mailgun option for contact form
Sahat Yalkabov
mattwoberts
yurivictor
Lee Munroe