Merge pull request #1932 from Stanford-Online/wescott-master-exercise-work

Wescott master exercise work
interactive grader timeout 5 -> 45 sec; add logging (#1916)
Merge pull request #1953 from Stanford-Online/sef-1916-interactive-timeouts

interactive grader timeout 5 -> 45 sec; add logging (#1916) to master
readme: opscode.org --> opscode.com in link (#1956)
Merge pull request #1957 from Stanford-Online/sef-1956-readme

readme: opscode.org --> opscode.com in link (#1956)
fix user-reported typo
Merge pull request #1959 from Stanford-Online/jinpa-master-typo

fix user-reported typo
mnt perms: ditch upstart (#1648) also terminal color (#1961)
.bashrc - add comments to ease upgrade later
fixes #1917.  Say it ain't so, Joe.

I'm leaving this commit message obtuse also because it's fun to
figure out what this change fixes a db integrity bug.
missed one spot
scale long queue, not short (#1944)
Couple of errors with south migration

Couple of errors with south migration
Merge with Master

Merge with Master: quite a few changes on this one
Move the username message above link in hopes of alleviating some #622 pain
regexp matchin across lines for 5380 5380
Merge pull request #1965 from Stanford-Online/jinpa-master-email-username

Move the username message above link in hopes of alleviating some #622 p...
Merge pull request #1969 from Stanford-Online/jbau-better-regexp-mathjax

regexp matchin across lines
Fix formatting error in Linux section.
It needs a blank line to trigger a preformatted section.
Merge pull request #1970 from sethoscope/master

Fix formatting in Linux setup