Massive updates
Merge branch 'master' of github.com:larsericsson/screenie
Minor useless stuff