removing references to my username
adding a key mapping for context in intellij
Merge branch 'master' into mdodsworth-air