Edit raring post.
Merge branch 'pelican' of github.com:cmars/cmars.github.com into pelican