Removing alphabetical_order and making default_scope be alphabetical
Removing alphabetical_order from ComputerGroup and making default_scope be alphabetical
Adding default_scope to Computer
Adding default_scope to Unit
Adding default_scope (name, alphabetical) to User
Adding default_scope (name, alphabetical) to UserGroup
Adding rails_panel (https://github.com/dejan/rails_panel) to development gems
Switching to single quotes for Gemfile
Merge branch 'master' into default_order
Adding ruby 2.0 to travis config
Upgrading rspec and vcr gems
merging with master
Ignoring coverage folder
Merge branch 'master' into default_order
Missed one _url call
Merge branch 'default_order' into Code-improvements

Conflicts:
	Gemfile