First batch of changes and Map rewrite
Merge branch '2013' of github.com:Cadair/scipy_proceedings into 2013

Conflicts:
	papers/stuart_mumford/sunpy_mumford.rst
More tweaks