react update and test changes associated
Merge branch 'master' into jhbate/update-react

Conflicts:
	package.json
Merge branch 'master' into jhbate/update-react

Conflicts:
	package.json
Merge pull request #5 from tidepool-org/jhbate/update-react

Jhbate/update react