Merge "setup.py fix for non py files during installation"