fix to issue #579 using astropy.units
fix for issue #471
fix for test of to_angstrom
small python syntax fix
Merge pull request #610 from ehsteve/fixbug471

Fix for issue #471 and issue #579
Merge branch 'master' of https://github.com/sunpy/sunpy into database
fighting travis continues