Minor fixes and additions
Merge branch 'master' of https://github.com/Ferk/scripts

Conflicts:
	README.org
Merge branch 'master' of https://github.com/Ferk/scripts

Conflicts:
	README.org