autopep8 Headphones.py
autopep8 headphones/__init__.py
autopep8 headphones/albumart.py
autopep8 albumswitcher
autopep8 api.py
autopep8 E231 whitespace after some punctuation
autopep8 E203 whitespace before colon
autopep8 E301,E302,E303 too many / too few blank lines
autopep8 E221,E222,E225,E227,E228,E251 spaces around operators and in parameters
manual pep8 W291,W293,W391 blank lines, trailing whitespace
autopep8 E272 whitespace before multiple spaces before keyword
Fix more config saving options
Merge remote-tracking branch 'origin/develop' into feature/autopep8

* origin/develop:
  Fix various config keys and template config keys to round trip more data
  Fix global of CURRENT_VERSION + other things that pylint points out
  Fix argument to turn SSL cert checking on and off

Conflicts:
	headphones/__init__.py
	headphones/webserve.py
Merge pull request #1982 from jmullan/feature/fix_more_config_saving

Fix more config saving options
Merge remote-tracking branch 'origin/develop' into feature/autopep8

* origin/develop:
  Fix more config saving options
Merge branch 'feature/autopep8' into feature/travis-ci

* feature/autopep8:
  Fix more config saving options
  autopep8 E272 whitespace before multiple spaces before keyword
  manual pep8 W291,W293,W391 blank lines, trailing whitespace
  autopep8 E221,E222,E225,E227,E228,E251 spaces around operators and in parameters
  autopep8 E301,E302,E303 too many / too few blank lines
  autopep8 E203 whitespace before colon
  autopep8 E231 whitespace after some punctuation
  autopep8 api.py
  autopep8 albumswitcher
  autopep8 headphones/albumart.py
  autopep8 headphones/__init__.py
  autopep8 Headphones.py
Ignore various pep8 comments rules
Fix W601 .has_key() is deprecated
Fix E711 comparison to None should be if cond is None:
Fix E201,E202,E211,E241,E303 whitespace issues