test redis provider switch
update readme
refactor message type logic
bump to play 2.2.1
app works but still needs style updates
style cleanup to make it pretty
remove unneeded test
fix sbt
Revert "fix sbt"

This reverts commit 1dcb186403b9efa6907fd5bf2f7c32860878eb03.
Update README.md

Updated heroku options
Changed Robot to Minutes
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'jamesward/jamesward-cleanup'

Conflicts:
	app/models/ChatRoom.java
	app/models/Robot.java
	conf/application.conf
Revert "Merge remote-tracking branch 'jamesward/jamesward-cleanup'"

This reverts commit 629a564d5c8e8b921ddc825f2238e19eb8a948dd, reversing
changes made to ad2653d3678a5f3ef2d7b61ab91663d7a9a2adb0.