fixing stuff in the flask part thats all broke 6
Merge branch 'master' of github.com:bazaarvoice/bythebeardofazel