Improved the core datatype factory base class and updated MapFactory to
use the new version.
Merge branch 'master' into factory_update

Conflicts:
	sunpy/map/map_factory.py
	sunpy/util/datatype_factory_base.py
Fix the documentation warning by removing the manual Methods section
Merge pull request #1 from Cadair/map_factory_update

Fix the documentation warning by removing the manual Methods section
Merge pull request #729 from rhewett/factory_update

Improved the core datatype factory base class and updated MapFactory to use new version.