Added wheel support
removed pytest integration from setup.py
Merge remote-tracking branch 'upstream/master'