Simplify execution of demo and prepare travis build