added 'number of contracts' column in listings
fixed conflicts
Merge pull request #277 from jroo/num_contracts_col

Added column to show number of NAICS contracts in vendor list