Merge pull request #146 from Socapex/osx

Fix for settings path. Fix for pixel colors.
Update .gitignore
Merge branch 'master' into osx