Bump rails to 4.1.6
Use size instead of length in views

I presume size used to work but it does not now for some reason.
Switch to strong parameters

I had been using protected attributes to ease the transition from Rails
3.  Seemed time to make the conversion to Rails 4's strong parameters.

I was inconsistent in the controllers about specifying dasherize: false
when generating an XML representation of a model.  Now all such cases
specify dasherize: false.

Several controllers used a bogus route helper in their destroy method,
that has been fixed.

Write tests for affected controllers.
Bump rails to 4.1.6
Use size instead of length in views

I presume size used to work but it does not now for some reason.
Switch to strong parameters

I had been using protected attributes to ease the transition from Rails
3.  Seemed time to make the conversion to Rails 4's strong parameters.

I was inconsistent in the controllers about specifying dasherize: false
when generating an XML representation of a model.  Now all such cases
specify dasherize: false.

Several controllers used a bogus route helper in their destroy method,
that has been fixed.

Write tests for affected controllers.
Merge branch 'poblahblahblah-master'

Conflicts:
	server/app/controllers/clients_controller.rb
	server/app/controllers/etch_configs_controller.rb
	server/app/controllers/facts_controller.rb
	server/app/controllers/originals_controller.rb
	server/app/controllers/results_controller.rb
Move json below xml so that xml is the default

This is necessary to support older clients which don't request a
particular content type and expect XML.
Add support for JSON format responses
Add some basic testing of the files controller
_url to _path for layouts/application.html.erb