Merge branch 'hotfix1' of http://github.com/openwebwork/webwork2 into develop_tmp

Conflicts:
	conf/localOverrides.conf.dist
Clean up comments about configuring the path to OPL or NPL
Make default to assign only to the current user when importing a set def file
Merge branch 'develop' of https://github.com/openwebwork/webwork2 into develop
Remove <<<HEADER line
Merge pull request #92 from mgage/develop

Tweak comments in localOverrides,  Fix default order of "assign to all vs assign to one" in HomeworksetsEditor2

Comments about OPL/NPL may not be right yet, but this is an improvement