improved key bindings
Merge branch 'master' of github.com:joewarren/jeffica

Conflicts:
	view/index.html
Merge branch 'master' of github.com:joewarren/jeffica