flight-keyboard-shortcuts attempt -- not working.
moving to mousetrap-- it works better
Merge branch 'master' into keyboard

Conflicts:
	app/scripts/main.js
	bower.json
merge
still can't get flight-keyboard-shortcuts working, boo.
keyboard shortcuts added; connected to fullscreen; fixes #2 fixes #3