Change doc so build status from travis is shown in readme
Updated readme to show badges. Also added coverage packages to packages.json
Resolved conflicts in the package.json file