last bit
Merge branch 'master' of https://github.com/sunpy/sunpy into displ-entries-time
Temporary fix for sphinx fails on Travis
Merge branch 'master' of https://github.com/sunpy/sunpy into issue766
Merge branch 'master' of https://github.com/sunpy/sunpy into dbtest-travis
Merge branch 'master' of github.com:sunpy/sunpy into docs
workaround for solving connections behind through proxy servers
Merge pull request #767 from derdon/issue766

Support query result blocks with the wave unit kev.
added pytest.ini.
ignores the build and *.egg-info dirs and does not test doctest text files
Merge branch 'master' of https://github.com/sunpy/sunpy into displ-entries-time
Merge branch 'master' of https://github.com/sunpy/sunpy into dbtest-travis
Merge pull request #769 from derdon/displ-entries-time

database.tables.display_entries: do not display microseconds
added GOES event list utility to sunpy/instr
added tests for GOES event list utility in sunpy/instr/tests/
typo fix for test_goes.py
fix for test_goes.py
Merge branch 'master' of https://github.com/sunpy/sunpy into issue771
Move all sphinx doc source out of sunpy dir.
Change any broken links / refs
updates tests from test_attrs.py to latest changes