remove minitest dependencies from master
updated travis file
fixed merge conflicts