Update type map to omit lines
Switch to using load-grunt-tasks for Grunt dependencies
Merge branch 'master' of github.com:sreed/webproject

Conflicts:
	sass/core/_base.scss