Updated Gemfile to reflect current Github versions, updated Readme, maruku is buggy so change to rdiscount for markdown