Travis updated for development branch
Merge branch 'updating-travis' into development