Adding clockwork SMS to the API mix
Tweak to the clockwork view
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json
Removed commentted out lines from clockwork.jade
Using the newest clockwork npm package
Update README.md

Added clockwork sms to the api list
Merge branch 'master' of https://github.com/mediaburst/hackathon-starter into mediaburst-master

* '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
Consolidated clockwork updates
Merge branch 'master' of github.com:sahat/hackathon-starter

* 'master' of github.com:sahat/hackathon-starter:
  Update README.md