Stashing the last of changes before attempting to upgrade to octopress.