Moar cleanup
Merge branch 'flask' of github.com:Version2beta/version2beta into flask