Add fix for settings that include dashes. (Also upgrade to VS2013 solution.)