first test moves
fix the tests of the tests
move new tests
Fix sunpy.self_test()
make sunpy.self_test() neater
2.6 fix in self_test
Support query result blocks with the wave unit kev.

This fixes #766.
database.tables.display_entries: do not display microseconds
Merge pull request #743 from Cadair/test_locations

Move test locations to submodule/tests
Merge branch 'master' of https://github.com/sunpy/sunpy into issue766
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 pull request #767 from derdon/issue766

Support query result blocks with the wave unit kev.
Merge branch 'master' of https://github.com/sunpy/sunpy into displ-entries-time
Merge pull request #769 from derdon/displ-entries-time

database.tables.display_entries: do not display microseconds