Configure rails for heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Uncomment autoplay
Merge branch 'master' into heroku
Merge branch 'master' into heroku
Merge branch 'master' into heroku

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'master' into heroku
User icon usurps user work
Merge branch 'master' into heroku
Add cron task to prune inactive users
Start adding tests
Add more podcast tests
Switch test from fixtures to factories
Use faster yajl json generator
Merge branch 'master' into heroku