Rename legacy 'toolkit' references to 'cyclescape'
Merge branch 'cyclemaster' into deploy
Merge branch 'deploy' of https://github.com/auto-mat/toolkit into deploy