SRIM bugfix

* Fixed SRIM bug where files generated with older SRIM programs were
not read properly
* Updated makefiles for Yosemite