Cleaning up some odds and ends
Merge remote-tracking branch 'origin/master'