rubymine settings: jasmine templates, maybe some other stuff
git conflict style; fix gdc shortcut