Highlight effect on input, nicer space support
refactor, show proper key map, nicer space
Merge branch 'master' into gh-pages

Conflicts:
	index.html