cleanup
Merge branch 'master' of github.com:evandor/skysail-server