Issue fixed in utest, removing quick fixes.
Added special flash run script for Travis to fix arbitrary xvfb-run crashes.