modify for mac
merge with linux settings
changes in config
cmd is control, option is meta
change hotkeys for abbrev-expand
merge with master, get fresh erl-utils
change erlang templates
tweak shortcuts
add global-auto-revert-mode
changes in hotkeys
comment out haskell mode
merge with mac branch