Modify gitignore
Fix some tests
Merge branch 'development' of github.com:martijnbolhuis/task_system into development
Remove deploy.rb