Added default settings to local.py in the event on is not provided
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/crushbone