VARIOUS some things that were on my machine but appearently not on others.
Merge branch 'master' of github.com:martflu/amanaman