.hi files are now added to completion-ignored-extensions by haskell-mode
Enable eldoc-mode in haskell-mode
Tidy up git-svn command
Merge branch 'master' of github.com:purcell/emacs.d
Use my new flycheck-package checker in emacs-lisp-mode
ruby rvm
Ignore .sx, .cask
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore