Merge pull request #23 from svermeulen/working

Changed to use nnoremap instead of nmap.
Merge remote-tracking branch 'base/master' into working