Merge branch 'staging' of https://github.com/sunpy/sunpy into database
updated database/TODO.rst
Change jp2.read to be compiliant to pair standard.
Database.get_tag: raise NoSuchTagError if a tag cannot be found instead of returning None
new method Database.remove_tag: support removing tags from a given entry
Merge branch 'master' of github.com:sunpy/sunpy
WHO KNOWS?!
Merge branch 'staging' of github.com:sunpy/sunpy into sun_ana

Conflicts:
	sunpy/io/fits.py
MOre
support changing the cache size of the database
Database.query: support querying for download paths
Made changes so it works and confroms with new IO
style. I think.1
Merge pull request #506 from Cadair/0.3_travis

Add Travis section to Dev docs
squash bugs
Merge pull request #507 from Cadair/0.3_tests

Write more tests!
Merge pull request #508 from Cadair/0.3_docs

Documentation Improvements for 0.3
Merge pull request #509 from Cadair/0.3

Release admin
Added tests for resample and reshape_image_to_4d_superpixel
Merge pull request #513 from sunpy/0.3

Merge 0.3 into Staging
Merge branch 'staging' of github.com:sunpy/sunpy into sun_ana

Conflicts:
	doc/source/reference/io.rst
	setup.py
Merge branch 'staging' of https://github.com/sunpy/sunpy into added-test_resample