Support query result blocks with the wave unit kev.

This fixes #766.
database.tables.display_entries: do not display microseconds
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
Move all sphinx doc source out of sunpy dir.
Change any broken links / refs
Merge pull request #779 from Cadair/move_docs

Move docs from doc/source/sunpy to doc/source - @Cadair bets it fixes the problem.
Merge remote-tracking branch 'upstream/master' into hdu_selection
fix fits.py doc string typo