refactoring after Steve Purcell's suggestions
Merge branch 'master' of github.com:danielsz/om-mode