update an cleanup
Merge branch 'master' of github.com:unexceptednavyshower/oddly-cdn