add -f Gemfile.lock
fix link
update octopress
fix layout