Change in settings import to support django settings or test settings.
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/rtwo