Saving changes pre-Shane merge
Merge branch '3.0' of https://github.com/angular-ui/ng-grid into 3.0

Conflicts:
	src/js/directives/ui-grid-body.js
Scrollbar no longer jumping/jerking. Scrolls a little faster than the canvas though
WIP: canvas + scrollbar are going too far but are almost completely working