WebStorm 9.0.1 <btilford@btilford-laptop Update other.xml, editor.xml, project.default.xml, vcs.xml, ide.general.xml	Create gisttemplates_settings.xml, path.macros.xml, laf.xml, git.xml, atlassian-ide-plugin.app.xml, IntelliLang.xml, NetBeans 6_5 copy.xml, options.xml, pastebin_settings.xml
Reset to /home/btilford/work/idea-settings
WebStorm 9.0.1 <btilford@btilford-laptop Update other.xml, editor.xml, project.default.xml, vcs.xml, ide.general.xml	Create gisttemplates_settings.xml, laf.xml, git.xml, atlassian-ide-plugin.app.xml, IntelliLang.xml, NetBeans 6_5 copy.xml, options.xml
merge webstorm settings