Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Attempt to fix errors via a rebase
fixed wrongly indented elif in compositemap; other minor changes.
fixed typo in compositemap.py
More PEP-8 fixes

in map/sources/
PEP-8 fixes in map tests and lightcurve files
Fixed indentation problems in lightcurve.py and lightcurve/sources/eve.py
Minor changes in the map/ directory, mostly PEP8.
Master branch merge
Latest master merge
Revert "Latest master merge"

This reverts commit 689cd787c8086d9f49b921f93ed0dc0c1bb19f19.
Fixed test_hek2vso
Fixed merge conflicts that didn't show up in Git, but did in Travis (?)
Fix indentation error
Another indentation fix
Fixed test_database
Fixed test that is causing the Travis build to fail
merge master branch