trying to merge
Merge branch 'ewb' of github.com:etano/pimcpp into ewb
Merge branch 'ewb' of github.com:etano/pimcpp into ewb
Merge branch 'ewb' of github.com:etano/pimcpp into ewb
adding correction to potential now as well