Final edits and switch to haml reding markdown