Merge branch 'projects/enova' of github.com:brooksryba/SimpleSeer into projects/enova
Some updates n stuff
Fix merge conflict
Merge pull request #13 from ahomatthew/projects/enova

Projects/enova