change order of gemfiles for faster builds
cleanup trailing whitespace