Merge branch 'master' of https://github.com/tourismwhistler/2014

Conflicts:
	css/main-cart.css
	css/main.css
	css/styleguide.css

First revision of calendar blackout dates
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main-cart.css
	css/main.css
	css/styleguide.css