upped Carton's version to 1.0.9, removed hardcoded Carton tarball, removed carton.lock (will replace with cpanfile.snapshot)
upped Carton's version to 1.0.9, removed hardcoded Carton tarball, removed carton.lock (will replace with cpanfile.snapshot)
Merge branch 'carton_1_0_9' of https://github.com/berkmancenter/mediacloud into carton_1_0_9

Conflicts:
	install_modules_outside_of_carton.sh
Git version of carton.lock purging
note about a potentially failing Carton install
properly named FCGI Carton dependency
add cpanfile.snapshot, a new form of carton.lock
different parameter order to execute Carton ("-Ilib/" is passed directly to "prove"; "--" before arguments is optional according to the Carton's changelog)
renamed carton.lock to cpanfile.snapshot in documentation and utility scripts
restored comment on top of the file
numbered comment lines in "cpanfile" in order for it to get sorted properly

Conflicts:
	cpanfile
C locale ordering of "cpanfile" lines
wrap everything in an eval to avoid rare die() errors from xml treebuilder stuff
Merge branch 'master' of github.com:berkmancenter/mediacloud
overwrite existing file if it already exists
improved error message
print controversy label on stderr
fix trayvon feedproxy stories
add media and story merging to ui
chop title at 1024 characters to avoid postgres index error