Merge pull request #2 from stevemcquaid/steve

Updated prod pull from master. Also changed database.yml to use sqlite f...
fixed gemfile
temp commit - error *mass assign security* error
cool beans - need to fix login/logout flow becuase of rails automatic form generation bug with the buttons in the menu bar