Commiting any minor changes I made so that I can pull most recent code from master