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
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
Preventing jsBeautifier adding unwanted line breaks by setting breakChainedMethods: false in grunt options.
Name boolean values in a boolean way

Uses isX, hasX or shouldX for boolean variables.
Merge pull request #137 from niksoper/dev

Preventing jsBeautifier adding unwanted line breaks
Name public boolean-returning functions in a boolean way

Renames methods to be "shouldX", "isX", or "hasX"
Chart.zoomable => Chart.setInteractiveAxis
Merge pull request #135 from tpkelly/develop

Name boolean values in a boolean way
Clean up of Axis tests by introducing extra describe blocks
Introduce a minimal margin to auto-margin calculations
Merge pull request #141 from matthewdunsdon/fix-padding-issue-on-axis-tick-labels

Fix padding issue on axis tick labels