Merge pull request #398 from gtch/master

OS X support for the automatic deck import feature