Added a mapping for an easier escape from insert mode
Merge remote-tracking branch 'origin/master'