fix sql errors
removed carton.lock file because:

1) it doesn't seem to be compatible between Ubuntu and OS X
2) it prevents (instead of allowing) installation of dependencies on some machines
3) it is too big
Revert "removed carton.lock file" because having fixed+tested module versions makes up for a more stable deployment overall

This reverts commit ab6a566d6c2758100c1638f0cd919b0e09d61b70.
note about updating Carton modules
moved setting JAVA_HOME to a separate script because multiple scripts use that
make stories api work at old /api/stories path
Merge branch 'master' of github.com:berkmancenter/mediacloud
look in /usr/lib/jvm/java-6-sdk as well, since that's where the old ubuntu has the sdk; also print the error message regardless of platform