Fix path issues with test.py
Fix an issue where make docs breaks on a unconfigured boto
Merge branch 'master' of github.com:kormoc/Diamond
Merge branch 'master' of github.com:BrightcoveOS/Diamond