some changes before chris's merge
Merge branch 'source' of github.com:tsabat/tsabat.github.io into source

Conflicts:
	source/_posts/2013-06-29-painless-aws-autoscaling-with-ebs-snapshots-and-capistrano-part-3.markdown
migrate redis to a new server