Updating changelog and contributing files.
Migrating gh-pages changes to master branch

I did a bunch of changes to the gh-pages and I'm moving them to the
/docs folder in master