Set version to 2.1
Pep8 fix and updated docs
Small naming conventions fix
Added git sha tokens
Merge pull request #12 from timlinux/master

Set version to 2.1