Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
small change in aggregating peer eval grades (rounds up)
Wrote preliminary help modal acceptance tests
Fixed wording to better reflect BDD specs
Made filling field a bit safer
Tightened up wording
Stylistic change and factored out method to common
Added the full range of help modal options

Fixed pylint violations
Use calc's evaluator for staff answers in `Numercial` type

Rather than just calling `complex(...)` on the staff answers, also call
`calc.evaluator`. This way, simple things like `1/3` can be entered, as well
as more complicated explicit equations (e.g. `sqrt((12^2 + 26^2)/2)` etc, etc)

Simplify and update the tests to work with this.
Incorporate Anant's suggestions
Change pylint settings to not report in importing assert_* from nose.tools
Make sure to persist static tab name assignment.

STUD-663

Pylint updates.
Merge pull request #733 from edx/christina/static-tab

Make sure to persist static tab name assignment.
Merge pull request #734 from edx/zoldak/pylint-nose-import-not-an-error

Change pylint settings to not report in importing assert_* from nose.tools
Add doc strings and fix spaces
set first FAQ link to mktg webiste too
Merge pull request #742 from edx/fix/adam/help-modal-FAQ

set first FAQ link to mktg webiste too
indent even more
Merge pull request #710 from edx/jonahstanley/help-acceptance-test

Jonahstanley/help acceptance test