notyet
Merge remote-tracking branch 'cwales/master'
fixed a couple things