Riley, reporting in
Merge branch 'master' of github.com:collinglass/cdndevhack