Increase SSH key TTL to 8 hours
Alian `vim` to `vim -p`.

Using tabs quite often, this makes sure that all files I open are
always shown in separate tabs.
Set Capfile file type to `ruby`.

This enabled syntax highlighting in Capfile files.
Merge remote branch 'origin/master'