Installation Methods

Merged Sid Sijbrandij requested to merge installation-methods into master