begin OS X insert-mode refactor
Merge branch 'master' of github.com:tammeri/.files
begin OS X insert-mode refactor