Merge pull request #326 from RyanPineo/master

java: Allow else/elif to be expanded mid line.
Scala snippets fix
Update python.snippets

adding code encoding.
Merge pull request #327 from ches/fixes

Scala snippets fix
Merge pull request #328 from hallaj/master

Update python.snippets
Add asi => assert_includes
Merge pull request #330 from brandonhilkert/master

Add asi => assert_includes for Ruby
Add support for rnoweb filetype

Rnoweb is a filetype that combines LaTeX and R. It's used by systems like Sweave and Knitr.
Add in r.snippets file

I converted these over from the snipMate r.snippets in the snippets/ directory and removed some ones.
Add R snippets to Rnoweb
Tidy up some parts of r.snippets
Merge pull request #329 from RyanPineo/master

Java: fix setter. camel case vars/types properly.
Add a few more snippets, fix errors as per #332

Hopefully this looks better, @SirVer!
Remove duplicate snippet
Remove trigger from the end of the description
Merge pull request #332 from jdavis/r

New R and Rnoweb snippets
Fix snippets syntax error
Merge pull request #333 from jdavis/r

R: fix snippets syntax error