problem with line endings while commiting
fixing merging
Merge branch 'master' of https://github.com/sunpy/sunpy
Merge branch 'master' of github.com:sunpy/sunpy into masterorigin
Merge branch 'master' of https://github.com/sunpy/sunpy into masterorigin
Merge remote-tracking branch 'upstream/master' into masterorigin
add unit tests for sunpy.time.julian  Issue #223
add limitation warning to doc string for xml_to_dict
Merge pull request #363 from JordanBallew/master

unit tests and doc string update
Merge pull request #362 from ehsteve/master

Doc fixes and fixed plotting for compositemap
Modified composite map to be in line with the new plotting style.

Also added the ability to plot legend based on the map names when it plots
contours
Change to docstring
Merge pull request #364 from Cadair/staging

Modified composite map to be in line with the new plotting style.
Merge pull request #365 from sunpy/staging

This is 0.2!
Merge pull request #366 from sunpy/0.2

Merging staging into master
Update README.md

placed show with peek
Update README.md
Changed docs version to 0.2
Merge pull request #367 from Cadair/0.2

Changed docs version to 0.2
Update doc version to 0.2