wip
major cleanup finished
Merge branch 'master' of https://github.com/evandor/skysail