Cleaned up a lot
Lots o' cleaning and bug fixes
Switched back from switch statement to if statements to attempt to fix arrow keys bug.
Merge branch 'master' of heroku.com:talking-circles

Conflicts:
	public/js/client.js