working with 1.8 now
Merge branch 'master' of github.com:Timbinous/dotman