xterm screen
ignore haskellmode.config
Merge branch 'master' of github.com:jaramago/dot-vim

Conflicts:
	haskellmode.config