changes in emacs settings
comment out haskell mode
merge with mac branch
fix bugs in erl-utils
add grep word under cursor
Merge branch 'master' into mac