Fixed typo in variable name
Commented out some lines in the travis-ci config to see if we can pass
Merge remote-tracking branch 'upstream/develop' into fancy-samples