Delete .project
Delete .pydevproject
Merge remote-tracking branch 'origin/master' into overhaul