Update dropbox conflict helper to suggest newest duplicate as top pick
Add ability to unpack or install payload of a MAS package contained in a disk image.
Merge branch 'master' of github.com:liyanage/macosx-shell-scripts

Conflicts:
	dropbox-conflict-helper.py