pep8 fixes
Merge remote-tracking branch 'upstream/master' into pep8_fixes

Conflicts:
	sunpy/cm/color_tables.py
	sunpy/time/time.py
removed non-pep8 fixes
Merge remote-tracking branch 'upstream/master' into pep8_fixes
fix to color tables formatting
merged conflicts
Merge pull request #983 from ehsteve/pep8_fixes

[Review]: Pep8 fixes