Adding clockwork SMS to the API mix
Merge pull request #88 from ammit/upstream

remove crypto module and add repository field
Tweak to the clockwork view
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json
Add linkedIn auth to secrets.js
Add passport-linkedin package
Removed commentted out lines from clockwork.jade
Add linkedin /auth and /auth/callback routes
Add linkedin id field to User model
Using the newest clockwork npm package
Add linkedin button styles
Replaced custom social button styles with bootstrap-social css library
Redesigned Login page (now includes Sign in with LinkedIn)
Updated passport-linked library that's compatible with Oauth2
Add LinkedIn passport strategy
Add link/unlink LinkedIn to profile template
Updated LinkedIn auth routes to include mandatory "state" object
Updated LinkedIn secrets.js to have scope, clientID and clientSecret
Add LinkedIn obtaining api keys instructions
Updated LinkedIn instructions