Merge pull request #19 from materialsvirtuallab/master

Streamline some code.
move FW_VERSION to setup.py to get rid of install errors
Revert "move FW_VERSION to setup.py to get rid of install errors"

This reverts commit 8e8229104b620b92cca5a313af5468270f5737d5.
adjustment to prevous commit