Ignore PyDev settings
Code cleanup and name consolidation
Refactored settings handling