Actually allow psd_native to optionally be present
Merge branch 'master' of github.com:filp/psdiff