whitespace cleanup and file cleanup

Signed-off-by: Chris Boertien <chris@aktionlab.com>
Merge branch 'master' of github.com:zukowski/chickun-trader

Conflicts:
	app/assets/javascripts/dashboard.js.coffee