Merge branch 'master' of git://github.com/imathis/octopress

Conflicts:
	README.markdown

Signed-off-by: Samuel Ford <corrosion@me.com>
Merge branch 'master' of github.com:causticmango/octopress-site
Merge branch 'master' of github.com:causticmango/octopress-site