fixed tests which causes trouble on travis
do not ignore tests anymore with fails_on_travis as their mark
use py.test with the -s flag;
Merge branch 'master' of https://github.com/sunpy/sunpy into dbtest-travis
Merge branch 'master' of https://github.com/sunpy/sunpy into dbtest-travis
Merge branch 'master' of https://github.com/sunpy/sunpy into dbtest-travis
simplified test for the database package
Merge branch 'master' of https://github.com/sunpy/sunpy into dbtest-travis
Merge branch 'master' of https://github.com/sunpy/sunpy into dbtest-travis
skip test on Python 2.6 b/c it fails there
fixed conditional test skip
skip more tests if Python 2.6 is used
fix skipping of tests that fail on Python 2.6
Merge branch 'master' of https://github.com/sunpy/sunpy into dbtest-travis
Merge pull request #833 from wafels/0.4-docchanges-3

0.4 docchanges 3
Merge branch 'master' of https://github.com/sunpy/sunpy into dbtest-travis
Merge pull request #836 from derdon/dbtest-travis

travis tests (to 0.4)