2014-08-29
Merge branch 'master' of github.com:adamcavendish/homeconfig

Conflicts:
	.zshrc