Fix ubuntu key archive issue
Merge branch 'master' of https://github.com/johnwlockwood/pyramid-dev