Merge pull request #10 from mkelley/dev

Update setup.py for instruments.
Merge pull request #11 from mkelley/dev

Fix data install location