re-added some stuff that got uncommented and munj'd
Merge remote-tracking branch 'origin/master'