j7 setup updates and cleanup.
Merge pull request #6 from samuelkgutierrez/master

j7 setup updates and cleanup.