Fix gemfile issue
Fix conflicts
Update maruku
Add lockfile
Add blog post about PyCon FA