Merge pull request #63 from pokelondon/feature/maffs

Feature/maffs
Merge branch 'develop'

* develop:
Merge branch 'develop'

* develop:
  Admin performance tweaks
Merge branch 'feature/deployment_config'

* feature/deployment_config:
  removing some stuff
  socket io lib from cdn
  Trying another heroku app for the socket server
  Redis url as broker url
  Password for redis client. and modified version of the library
  Optional profile image save
  Adjusting fallback config specification, just in case
  Oh my god. moving stuff
  memcache addon
  Hututupuh
  Adding default DB url and debug in procfile
  Not a node app heroku!
  Trying env based config for running on osx
Removing old config folders
Socket server host
adding celery to procfile and starting readme
Grunt
Hiding package.json, so it doesnt fuck with heroku
Celery doc
Merge branch 'master' of github.com:pokelondon/pokeradio

* 'master' of github.com:pokelondon/pokeradio:
  Initial commit