Improved use of bundle in deploy

- Updated deploy instruction in README
- Put deploy:setup back into local.sh
- Fixed local.sh's CLI
- Let Capistrano create directories under the CitySDK root