Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/templates/index.html

Update SASS and Bourbon, add Neat

change log levels on the delete course utility. Otherwise they get filte...

tracking in idashboard should only log json-serializable objects

move setting changes in tests to override_settings

Fix course url link in enrollment emails.

change log levels on the delete course utility. Otherwise they get filtered out in production environments (min set to WARN level)

Ned/fix noisy docs

We used to do it this way, I'm not sure why it was changed.
Our settings files add directories to the path, so we need to
do it here so that names will be importable.

refactor login and enrollment test cases to use the mongo modulestore

added namee to authors file

fix to problems with uploading files