Pep8 cleaning.

Jonahstanley/fix flakey tests

Peter fogg/remove video xml

Don't mention edge in the e-mail; same text used for edge and edx.

studio - revising the visual design of UI well pattern

On marketing site, disable course settings options that do not work.

Added testing for grading settings

Conflicts:
	common/djangoapps/terrain/ui_helpers.py

As a result, changed inputfield to return the css, and all of the element.fill() to css_fill

Will/fix video acceptance tests

Now only check for the css that appears when the accordion is done

pep8 fixes.

Fixed the preferences scope of xblock.

Added self to authors.

Conflicts:
	AUTHORS
	CHANGELOG.rst

Cale/stabilize dev env

Conflicts:
	CHANGELOG.rst
	rakelib/assets.rake

Conflicts:
	CHANGELOG.rst

Previously, multiple copies of the watchers started from the different
shells would run simultaneously, which left the possiblity of zombie
watchers, increased resource consumption, and incorrect results. This
fixes that problem by only starting a watcher if that same command isn't
already in the process list.

Fixes LMS-499

Use md5 checksumming to verify that we only write out xmodule asset
files whose contents differ from what we are about to write. This
minimizes thrashing of the other watchers.

Fixes LMS-452

xmodule-assets creates coffeescript files in the output directories. On
its next run, it used to delete the javascript files compiled from those
coffee files. Now it doesn't which should make coffee have to do less
work.

Fixes LMS-451

When running under watchmedo, coffee doesn't display any useful
information when it recompiles a changed file, so we make watchmedo echo
that information instead.