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