Merge branch 'master' of github.com:adamcavendish/homeconfig

Conflicts:
	.zshrc
Merge branch 'master' of github.com:adamcavendish/homeconfig
20141113