moved some stuff, playing with skrup, updated shell
Merge branch 'master' of https://github.com/mschober/bunch-of-scripts