fix rebase conflicts
Merge pull request #9 from paulnorthup/add-zen-grids-and-load-path

Adds demo for sass load paths from bower, adds zen-grids