WIP - migrating machines
Merge branch 'master' of github.com:rapidftr/RapidFTR

Conflicts:
	app/models/child.rb
	spec/models/child_spec.rb
Merge branch 'master' of github.com:rapidftr/RapidFTR
Update solr config to ASCII-fy multi lingual characters
Update sunspot rake tasks
Update Docker to reflect latest Solr upgrades
Update Docker to reflect latest Solr upgrades, persist volumes and create SSH keys
Minor Docker refactorings
Docker: Enable HTTPS in CouchDB
Merge pull request #670 from tomclement/master

Adds test coverage for rapidftr/tracker#41
Changed line endings in Gemfile to Unix

Closes https://github.com/rapidftr/tracker/issues/109
Updated infrastructure
Updated Vagrantfile to use Librarian-Chef
Update infrastructure for Docker
Merge pull request #671 from RapidRailsGirls/unix_line_endings

Changed line endings in Gemfile to Unix
Updated Vagrant and infrastructure to use latest Chef and plugins
Convert Windows line ending to Unix line endings
Merge pull request #672 from sferik/dos2unix

Convert Windows line ending to Unix line endings
Merge branch 'master' of github.com:rapidftr/RapidFTR

Conflicts:
	app/models/child.rb
tests for solr multilingual search