update
adding slimmer to travis take 1
travis fix put on hold- [TODO]: use selenium for testing
selenium setup tests working
karma-selenium working
removed slimer from browser launchers
cleanup of grunt modules for testing
CLI single-run for running karma in selenium
attempt at stopping selenium from hanging
removing slimerJS install shell file
Merge pull request #178 from stites/travis

Travis now uses Karma/Selenium for testing suite
paired travis encryption with satellite-game repo
fp-third-person switches on "v"
Merge pull request #190 from stites/fp_tp

fp-third-person switches on "v" closes #132
Merge branch 'dev' of https://github.com/satellite-game/Satellite into dev
Merge branch 'dev' into nonPlayerController

Conflicts:
	Gruntfile.coffee
	client/game/classes/s.SatelliteGame.js
re-add unhook function for bots. fix error