Merge remote-tracking branch 'origin/carlos_settings'
Revert "Merge remote-tracking branch 'origin/carlos_settings'"

This reverts commit af455a9912005bde5c8ac546eb9a92faa7748f7c, reversing
changes made to 709e51bb8f45b42fa51371252b322556bd1f70b1.
changed config
Merge remote-tracking branch 'origin/master' into carlos_settings
added version string