Restructure to work with rcup
Merge branch 'master' of github:DanThomson/dotfiles
Merge with master.
Conflicts:
	.gitignore