update
Merge branch 'master' of https://github.com/riceje7/Coda-2

Conflicts:
	Plug-ins/Docblock.codaplugin/Contents/Resources/site.pyc
	Sites/06F2C462-541E-448C-818A-F59DCC6F21EC.codasite/site.plist
	Sites/60183869-54AA-424C-9FFC-0929A29AB16C.codasite/site.plist
	Sites/78479FCA-AA2D-4D8B-B625-8F0443F6C9B3.codasite/site.plist
	Sites/93D9B1BB-4764-4447-AFF8-2D0B31813FB6.codasite/site.plist
	Sites/9B5E8CF5-7E95-4FCC-9504-56A75211060F.codasite/site.plist
	Sites/A9ED550E-E221-4AED-B612-42C80487F5F8.codasite/site.plist
	Sites/CA04972F-A110-4299-AA18-369C7ADEC77D.codasite/site.plist