Minor fixes
Removed obsolete script
Merge branch 'master' of https://github.com/jgruselius/misc

Merging minor changes