Fix indentation.
Move travis branch specific command into bash script so we don't have to deal with merge issues.