Merge pull request #3 from OceanLabs/master

yep sure
Intergrated TemplateManager's code into kite.py
I don't know whether or not I should leave the comments in but I have for the time being.
Yay
edited the comments in the code and removed burp()

should comply with PEP0008 (or pep8 for short)#
Well this is what I have done thus far
Update
Merge pull request #8 from victor-baumbach/master

updating the OceanLabs version