Update default_achievements.axp
Limit default Options

The default options in localOverrides shouldn't include the more experimental options.
Merge branch 'master' of https://github.com/openwebwork/webwork2 into devup

Conflicts:
	conf/localOverrides.conf.dist
Merge pull request #275 from goehle/devup

Master into Develop
Merge branch 'develop' of https://github.com/openwebwork/webwork2 into develop