Merge branch 'heroku'

Conflicts:
.gitignore
server/config/authorization.js
Merge branch 'master' of https://github.com/oredi/TwitThruSeet
Fixed error handling