Merge branch 'qtpy'

Merge branch 'qtpy'

* qtpy: (216 commits)
  qtpy: make git-cola pyside-compatible
  widgets: reorder classes so that the mixin's closeEvent() takes priority
  Release 1.1.1
  Update Changelog
  Make qtpy to set the QT_API environment variable
  cola: set version to 2.7.beta
  dag: call mixing constructors explicitly
  widgets: use QtWidgets.QSpacerItem
  qtutils: use QtWidgets.QGridLayout
  pyqt4toqtpy: add QGridLayout and QSpacerItem
  Back to work
  Release 1.1.0
  Update Changelog
  Update Changelog for previous versions using the output of loghub
  xbase: add flake8-suggested whitespace
  spellcheck: move copyright to fix flake8 warnings
  grep: initial widget state setup
  finder: split long line
  diff: fix alignment
  completion: wrap long line
  ...