* Ignore pycharm files
* include the license
* Update setup to pull version
* Remove old version file
* Add version and license
* Fix conflicts