A few minor edits for haskell editing mostly
Merge branch 'master' of github.com:benekastah/osx-bootstrap

Conflicts:
	home/.vim/.netrwhist
mba modifications
Merge branch 'master' of github.com:benekastah/osx-bootstrap

Conflicts:
	home/.vim/au.vim
	home/.vim/vundles.vim
Merge branch 'master' of github.com:benekastah/osx-bootstrap
add nvimrc