more friendly feedback text, new boostrap
oops
remove banter
Merge remote branch 'upstream/master'