Generated master for commit f988d5b
Merge: 1ea1012 04b952d
Author: Robert Carlsen <rwcarlsen@gmail.com>

    merge matt/build-update: updated and cleaned up build instructions