updated setup-ubuntu
updated setup-ubuntu
updated installation instructions
merge