Merge pull request #5 from hashken/python2

Allow for manual account config and other changes