Added some cancel buttons; fixed a race condition
Remove database.yml from repo