Mike

This needs to pull merged into both the develop branch and the master branch.

Currently they both have the pyc files and .idea folder in them