fix setup.py, ammend .gitignore for pycharm
tag 0.0.0
unit tests pass with tox
fix setup.py
add crypto tests
Merge branch 'master' into tests
tag release 0.0.1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	setup.py