Commit for merging.
Merge branch 'master' of https://github.com/ucsc/webtemplates2014

Conflicts:
	app/campus-home.html
Manual merge from github.com

Merge failed, so I pulled the raw file from Github to re-commit.
Sass reorganization.

All sass files are now organized in a more sensible way.
Remove swiper.js

JR switched to Owl Carousel.