remove travis-sepecific code from this branch
deleted much from travis settings, as minimal as possible
Update travis yaml with branch info
Fix merge conflict