git ignore dist/build directories from pip/setuptools
use find_packages() to ensure correct install with setup.py
Merge commit '6ff03a0' into import_fix