Updated prod pull from master. Also changed database.yml to use sqlite f...

...or local deployment when pulling from master