Improved behavior of parameter mask, added atom reordering
Merge branch 'master' of github.com:leeping/forcebalance