Restructure travis.yml file, more postgres work