Added npm support and update documentation to look good using markdown
Merge branch '1.x' into gh-pages