fix?
Upgraded various requirements
Bump lxml
Upgrade to a real pyquery
bump six
Bump simplejson
Bump requirements
Merge branch 'master' of https://github.com/alex/nba-gamethread

Conflicts:
	requirements.txt
Bump pyquery
Bump requirements
Move towards forcing https
One year of hsts
bump requests
bump requirements
bump simplejson
new requests release
bump requests
bump chardet
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  bump chardet
  bump requests
  new requests release
  bump simplejson
  bump requirements
  bump requests
  One year of hsts
  Move towards forcing https
  Bump requirements
  Bump pyquery
  Bump requirements
  Bump simplejson
  bump six
  Upgrade to a real pyquery
  Bump lxml
  Upgraded various requirements
  fix?