Merge remote-tracking branch 'frap129/master'

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>

Conflicts:
	README.mkdn
Make ubuntu script executable

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>
Merge remote-tracking branch 'sm/master'

Signed-off-by: Paul Beeler <pbeeler80@gmail.com>

Conflicts:
	README.mkdn