Merge pull request #133 from niksoper/dev

Update private, "internal" and public members to meet conventions.
Merge branch 'upstream' into working
Use braces around if blocks

Adds { } around the single-line if blocks
Activate "curly" jshint

This should prevent any curly bracket issues in future
Merge pull request #134 from tpkelly/develop

Use braces around if blocks
Using self rather than this whenever possible.
Merge branch 'master' of https://github.com/ScottLogic/insight into dev-selfthis

Conflicts:
	src/charts/Chart.js
	src/charts/Series/LineSeries.js