Updated files for spork and guard again
Fix Gemfile and database.yml to get everything running correctly