Rebase sg

Again, plese check sphinx/openstack documentation about comments. It'd be nice if we can get to have comments such as in https://google-styleguide.googlecode.com/svn/trunk/pyguide.html