Updated setup.py, gitignore