Rollup changes into your tree

Hi digvan,

as the owner of django_facebook_oauth it would be great if you'd pull all the changes made so far and merge it into your release.

/robert