mostly text changes
Merge branch 'master' of https://github.com/larskoeie/deploy