vastly simplify apache
Merge branch 'development' of github.com:twoflowers/vUp into development
Merge branch 'development' of github.com:twoflowers/vUp into development