v 2.0 initial cleanup
Merge branch 'maryjane2' of github.com:pylover/MaryJane into maryjane2