travis v6
Merge branch 'testing'
add django-facebook to requirements
Merge branch 'testing'