Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	.gitignore
	.rsyncignore
	README.md
	cmus/solarized.theme
Merge branch 'master' into develop

Conflicts:
	.gitignore
	README.md
fix
develop
updated dotzsh
fix:
Merge branch 'master' into develop
fix
Fix: path to realfile in verbose output
fix readme links
fix ordering
update modules
split README
fix
fix
Adding more defaults to zshrc
tidy up
update
update
add work hosts