Merge pull request #157 from DjBushido/master

Add code for Getopts
add anotation, get and set snippet, good for doctrine
fix a typo
Merge remote-tracking branch 'upstream/master'
Merge pull request #158 from chrisyue/master

add an "annotation, get, and set" snippet
R.snippets. Add snippets for frequently used plot and statistical test functions
Merge pull request #159 from ncloudioj/master

For r.snippets
fix typo
Merge remote-tracking branch 'upstream/master'
Merge pull request #161 from chrisyue/master

fix typoes
添加 javascript_jquery.snippets 软连接到 javascript-jquery.snippets
用来支持 neosnippet
Merge pull request #162 from allenm/master

Make the jquery snippet support the Shougo's neosnippet
A more complete property snippet for python.

This snippet is inspired by the snippet provided by Sublime Text. The
current snippet in the upstream repository is missing at least two
lines:

    return locals()
$1 = property(**$1())
Added elif snippet to htmldjango.
Fixing numbering in html snippets.
Merge pull request #166 from jmatth/html_css_fix

Fixing numbering in html snippets.
Merge pull request #165 from oa/master

Updated python property snippet and added elif snippet to htmldjango
Add more rspec snippets.
Merge pull request #167 from iurifq/master

More ruby rspec snippets
Fixed the {% with %} template tag from htmldjango.snippets