Adding local settings
Merging changes.

Merge branch 'master' of github.com:kandluis/crimsonstore
Updating gitignore
Setting up local env