Damn youse OSX
Add docblocks to PHP comment templates
Set 2 space indentation for scala files
Update Vundle syntax