-- updated vim bundle
-- minor additions to fish config
-- global gitignore on DS_Store
-- add nerdtree key map
Merge branch 'master' of https://github.com/SchwarzM/dotfiles

Conflicts:
	config/fish/config.fish