Merge branch 'master' of github.com:MicahElliott/dotfiles

Conflicts:
	.gitignore
unwanted removals, again