more cleanup in faction-trader guis
fix issue regarding interaction with worksite while on a team.  Closes
#84  
fix a few code minor formatting areas
add right-click chat output to a waterwheel generator
Merge branch 'master' into import_table_models