document `conflicts_with`

Only a stub now, but defined into DSL 1.0
Upgrade PuntoSwitcher to 1.4.0
Merge pull request #6758 from mariusbutuc/master

Upgrade Skitch to v2.7.3
Update blender to 2.72a
Merge pull request #6736 from rolandwalker/doc_conflicts_with

document `conflicts_with`
Merge pull request #6759 from ndr-qef/blender

Update blender to 2.72a
Merge pull request #6742 from yurtaev/patch-4

Upgrade PuntoSwitcher to 1.4.0
snippet-edit 20140422
Merge pull request #6763 from vitorgalvao/fix-6760

snippet-edit 20140422
update Adobe Air checksum

upstream seems to have changed the binary in-place
appstore-quickview
interface-inspector
nsregextester
radi
tokens
dynamiclyrics
plotdevice
Merge pull request #6773 from exherb/plotdevice

plotdevice
Merge pull request #6772 from exherb/nsregextester

nsregextester
pingendo

Closes #6768.