Fixed issue #856
Merge and replace pep8mod patch using new settings utility functions
fixing git weird behavior...
Merge branch 'master' of git://github.com/ninja-ide/ninja-ide
Missing parentheses on function call in settings.py
Removed unused IS_LINUX and IS_MAC flags from settings.py
Merge branch 'master' of git://github.com/ninja-ide/ninja-ide
Merge with ninja-ide master
Solved conflicts between local branch and master (latest changes)
Merge pull request #1103 from malderete/master

Fixed issue #856