Lots 'o stuff
Merge branch 'master' of github.com:behindcurtain3/skipper

merge