Robustify shocco install and config

* shocco has some non-optional prereqs, make sure they are present if
shocco is being installed
* set the path to installed shocco correctly
* add the working dir to .gitignore

Change-Id: If786ea9e28d3595775f7b86d2fe760dff8047f49
Keystone don't use deprecated token_format option

devstack was setting the token_format option in the keystone
configuration file. This option is deprecated so should not be
used.

Change-Id: I047de155f0d9d2a1c009533c2f97f505cc80c6de
Merge "Keystone don't use deprecated token_format option"
Merge "Robustify shocco install and config"
Merge branch 'master' of github.com:openstack-dev/devstack