Clean up routes.rb
Update resque_schedule.yml
gitignore resque_schedule.yml
Handle attempts to create a duplicate username nicely
Strip leading/trailing whitespace and trailing commas from new tags
Fix merge conflict