base16-textmate issue #3 - Fix Java highlighting
Merge pull request #79 from brunosabot/master

base16-textmate issue #3 - Fix Java highlighting
Add Textadept templates
Update Readme
Merge pull request #80 from rgieseke/add-textadept

Add Textadept templates
Added new scheme called shapeshifter
added template files for Prism
Merge pull request #86 from atelierbram/prism

added template files for Prism
Update README.md
Merge pull request #81 from tybenz/master

New scheme - Shapeshifter
Update vim.erb

Remove duplicate
Merge pull request #89 from alexeyten/patch-1

Remove duplicate condition
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Update vim.erb
  Update README.md
  added template files for Prism
  Added new scheme called shapeshifter
  Update Readme
  Add Textadept templates
  base16-textmate issue #3 - Fix Java highlighting