Merge pull request #35 from SCPR/dev-keller

Huge updates to many things and hopefully this works since Keller is merging from Brian's account