Minor improvements (typos & web links).
Typos, layout and links.
Added keywords and some minor stuff.
Merge branch 'master' into gh-pages