changing link
adding the rest of the cookie options
updating readme
Merge branch 'master' into gh-pages