changed OS to ubuntu. Cleaned up
Merge branch 'proceeding-buildmachine'