Changing how I call bower
Merge branch 'develop' of https://github.com/burrows-codefest/mercurious-server into develop

* 'develop' of https://github.com/burrows-codefest/mercurious-server:
  oath file added
Remove script
Update bower.json
Added angular res
Another sodding attempt
And again
working twitter feed
Another
Merge branch 'develop' of https://github.com/burrows-codefest/mercurious-server into develop
Cleaned
Merge branch 'develop' of https://github.com/burrows-codefest/mercurious-server into develop

* 'develop' of https://github.com/burrows-codefest/mercurious-server:
  working twitter feed
Updated again
Added bower comps
Renamed app js
tidied up socketIO route
Merge branch 'develop' of https://github.com/burrows-codefest/mercurious-server into develop
added twitter and bintheknow feeds
Merge branch 'develop' of https://github.com/burrows-codefest/mercurious-server into develop

Conflicts:
	app.js
	bower.json
added a github webhook