aliases updated
Merge branch 'master' of github.com:matthutchinson/workbench
plugins updated