update to octopress blog system
update atom.xml
Merge branch 'source' into gh-pages