Add support for keystone GET/POST & token issue

Also, lots of formatting fixes & code cleanup