Move spec files around to match their new counterpart names
Added --force-confnew to repair problem with travis elasticsearch installation.