Changed save locations, hopefully more useful. Fixed bromine test case
Merge branch 'master' of https://github.com/leeping/forcebalance