Bump version.
Remove file that's not installed any longer.
Snapshot 20140508.
Fix PLIST
Merge remote-tracking branch 'origin/master' into joyent