Clean up some more, rename protractor config file