Merge pull request #1 from stevemcquaid/sean

Sean
Updated prod pull from master. Also changed database.yml to use sqlite for local deployment when pulling from master
Merge pull request #2 from stevemcquaid/steve

Updated prod pull from master. Also changed database.yml to use sqlite f...
Updated Gemfile to include different db gems for different enviroments