updated default ruby to 2.1.0
removed WORDCHARS from zshrc
mergetool updated
ruby-version updated
add cabal to PATH
add user-cabal to PATH