Unclean up
Moving files
Merge branch 'master' into develop
Converted to Python 3.4
Converted to Python 3.4
Merge branch 'develop'
Cleaned some
Updated README