linux-setup: Ubuntu 13.04
Ubuntu 13.04 background
Merge remote-tracking branch 'upstream/master'
ssh keys, extra bashrc