Correct a number of import issues that came out of moving stuff out of src
Add *.pyc and *.swp to .gitignore