revert to 66b4f7edaf33b54cbc62140a272af908aa3925ee
Merge branch 'master' of github.com:urbn/botornado