Switched theme to solarized/sodarized light
Added coffeecompile
Merge remote-tracking branch 'mavenlink/master'
Merge branch 'master' into solarized-light
Mapped Jasmine CoffeeScript to CoffeeScript for linter
Updated RubyTest to use Solarized colors
Added ColorHighlighter as sub
Removed Local/ from gitignore to add (encrypted) license
snippets
Encrypted license
Merge branch 'solarized-light'
license conflict
Merge branch 'master' of github.com:jrolfs/sublime-settings

Conflicts:
	Packages/User/RubyTest.sublime-settings