removing unnecessary psicopg2 from settings
changing travis from 3.3 to 3.4
fixing merge conflict