Threw out travis
Merge branch 'master' of https://github.com/Varbin/varcrypt

Conflicts:
	README.rst
Merge branch 'master' of https://github.com/Varbin/varcrypt