Added setup.py
Merge remote-tracking branch 'origin/master'
Changing license from file to setup keyword argument.