reverting
Merge branch 'master' into old

octopress not working yet