Added logic for development vs local
Merge branch 'master' of github.com:nichochar/blackcastor