[Merge] lp:~qbalazs/installation-guide/trunk into lp:~ubuntu-core-dev/installation-guide/ubuntu

[Doug Smythies]

See also: https://code.launchpad.net/~dsmythies/installation-guide/trusty/+merge/212095
where I have included the stuff from here, but made it build.
-- 
https://code.launchpad.net/~qbalazs/installation-guide/trunk/+merge/190783
Your team Ubuntu Core Development Team is requested to review the proposed merge of lp:~qbalazs/installation-guide/trunk into lp:~ubuntu-core-dev/installation-guide/ubuntu.