Also renaming OS_AUTH_TOKEN to OS_TOKEN to be more consistent with OpenStackClient. Minor formatting changes. Added 'env/' to gitignore. Change-Id: I2ef4e6920b75b0abe79c7fe3e1ac06d8230001e3