fix bad link in course home pages
Merge branch 'deployed-2014'
Merge branch 'master' into django17
fix elasticsearch dep for newer haystack