Resolved conflicts from hotfix-2015-10-05
Sass Watch: sass --watch lms/static/sass:lms/static/sass -r ./lms/static/sass/bourbon/lib/bourbon.rb