Merge commit '45bc13aec56fcd0b55686d2305cf6e6852d467e8' from company-statistics

* commit '45bc13aec56fcd0b55686d2305cf6e6852d467e8':
  Bump version
  Cleanup similar to ELPA version
  Update version
  Offer light and heavy context scoring
  fix typo

Conflicts:
	packages/company-statistics/company-statistics.el

diff --cc packages/company-statistics/README.org
Simple merge

diff --cc packages/company-statistics/company-statistics-tests.el
Simple merge

diff --cc packages/company-statistics/company-statistics.el
Simple merge