Gitignore
Removed .pyc files
Rebased changes from upstream