Simplify .vimrc
Update .gitignore
Add bin to dotfiles repo
Merge branch 'master' of github.com:anoxic/dotfiles

Conflicts:
	.gitignore