Updated status to Travis
Merge branch 'master' into asg-tagging