fix merge conflict
Install vim-jsx
Exclude virtualenvs
Ignore DS_Store files
Merge branch 'master' of github.com:epall/dotfiles

Conflicts:
	.gitignore
	.vimrc