Cleaned up code to prepare for updates
update branch and fix conflicts
Merge pull request #14 from chuckcarpenter/lsvx/code_cleanup

Cleaned up code to prepare for updates