Merged changes from octopress/master into the rem.co theme