Fixed lots of stuff
Merge branch 'master' of https://github.com/hannahcclark/SiMBTA
Stuff got changed