Add dev-200 branch to travis whitelist
Remove unused var, thanks @Twisol
Merge branch 'master' into dev
Merge branch 'dev' into dev-200