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)
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