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
Crossfiltering tables.
Updated functions parameters to use 'Func' or 'Function' suffix.
Updated DataSet to use instance methods and self rather than this.
Merge pull request #136 from niksoper/dev

Using self rather than this wherever possible
Merge branch 'upstream' into develop
Name boolean values in a boolean way

Uses isX, hasX or shouldX for boolean variables.