removed octopress commits, added unicorn support