adding in travis ci stuff
Merging in last changes from hack night to travis ci changes.