Fix PHP getter and setter UltiSnips snippet

Was broken due to complex regular expressions applied to $1,
which made UltiSnips to complain about not knowing it.

Simplified the snippet using the already working getter and setter snippets.
Merge pull request #321 from adoboPullRequests/master

PHP, Ultisnips: Fix getter and setter snippets that contained an invalid reference.
Add python google style docstrings.
Merge pull request #322 from RyanPineo/master

Python: Add Google style docstring support.
Fix spelling throughout UltiSnips/python.snippets
Merge pull request #323 from gfixler/master

Fix spelling throughout UltiSnips/python.snippets
Added Jade templates
Merge pull request #324 from tUrG0n/patch-2

Added Jade Angular Snippets
Add `OPTIONS_HADDOCK` snippet
Merge pull request #325 from jdnavarro/master

Add `OPTIONS_HADDOCK` snippet
Merge remote-tracking branch 'upstream/master'