Cleaned up swp files and the conflicting pyc files
Merge branch 'develop' into teams
.pyc cleanup