Removing all .pyc files
Arg... removing the swap file as well. Remind me never to do a git add * again
Merge branch 'master' into develop