Add mappings for make! (to avoid automatically jumping to a new buffer)
and toggling autoread
Merge remote branch 'upstream/master'