updated cap deploy
added test scaffolding
Merge branch 'master' of github.com:callowaylc/gw-api