a bunch of new changes
Merge branch 'master' of github.com:jstacoder/pycrm
 to sync