Sutff
Merge branch 'py3' of github.com:nabobalis/sunpy into py3

Conflicts:
	sunpy/util/xml.py