various fixes
Merge branch 'master' of https://github.com/toddwschneider/gambletron

Conflicts:
	app/assets/javascripts/base.js