First post, rsync deploy en Rakefile
Merge remote-tracking branch 'origin/source' into source

Conflicts:
	public/atom.xml
	public/blog/2013/03/18/first/index.html
	public/blog/index.html
	public/sitemap.xml
	source/_posts/2013-03-18-first.markdown