Commiting my new favorite mappings
Fixes for gitgutter
Whitespace fixes