Change travis to use the same config file as everything else
Merge branch 'simplify_buildout' of github.com:BCCVL/BCCVL_Visualiser into simplify_buildout