Ensure correct abbrev file is used
Merge branch 'master' of github.com:craigmbooth/.emacs.d