Update install instructions for Linux and OS X.

Someone also needs to update Windows, but meh.
Merge remote-tracking branch 'upstream/master' into feature/experimental_structure