General commit.
Merge branch 'master' of github.com:iven/MyHomeSettings

Conflicts:
	.vimrc