upd
upd
vimrc: +haskell
upd
Merge branch 'master' of github.com:japgolly/.golly-rc

Conflicts:
	assets/.vimrc