cleanup
Merge pull request #23 from UW-Madison-DoIT/misc_b1_stuff

Misc cleanup of stuff