Merge pull request #4 from weverett/efp_compute

Updated with option setting and energy computation and display
cleanup
Merge pull request #7 from weverett/efp

Cleaned up efp calls a bit