Update djpyfs

And move from base.txt to github.txt

Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
update password reset template (TNL-503)
acceptance-rebase-20140926: Update cached test DBs - lettuce & bok_choy
acceptance-rebase-20140926: Fixed imports for discussion SCSS.
acceptance-rebase-20140926: Load internationalization of CourseMode lazily.

Fixes broken test running, since non-lazy evaluation creates an importError.
Merge pull request #263 from open-craft/acceptance-rebase-20140926

Acceptance rebase 20140926
Merge branch 'openedx/rc/aspen-2014-09-10' into aspen-merge
Merge pull request #265 from edx-solutions/aspen-merge

Aspen release - Merge additional commits since RC
merged with master