added twitter and bintheknow feeds
Merge branch 'develop' of https://github.com/burrows-codefest/mercurious-server into develop

Conflicts:
	app.js
	bower.json