bump to play 2.2.1
app works but still needs style updates
style cleanup to make it pretty
remove unneeded test
Merge remote-tracking branch 'jamesward/jamesward-cleanup'

Conflicts:
	app/models/ChatRoom.java
	app/models/Robot.java
	conf/application.conf