Merge pull request #26 from jbensal/master

added a basic header!
Update dependencies
Remove start command
Revert "Remove start command"

This reverts commit e59059af0eb995ecc5ccf28a94f85102f49b41ab.
Fix input style
Updated env vars for Heroku
Fix mongo URL
Stop using canonical middleware for now
Add back canon middleware
Add new API endpoint for timeline
Added hashtags
Updating travis for heroku
Merge branch 'master' of github.com:Illinois-Founders/pulse
Updating Heroku API key for Travis
Split into panes
Merge branch 'master' of github.com:Illinois-Founders/pulse

* 'master' of github.com:Illinois-Founders/pulse:
  Updating Heroku API key for Travis
  Updating travis for heroku
Merge commit '45432eac20769c0b8227e1f5b7af72ca05aa1aff'

* commit '45432eac20769c0b8227e1f5b7af72ca05aa1aff':
  Added hashtags

Conflicts:
	app.js
Fix missing lodash.map
Fix tests
See if this works with travis