add y to keyremap
Merge remote-tracking branch 'origin/master'
tidy
ignore htmlcov
tmux from sjl