Merge in Lamp-Only options

Finally merge lamp-only branch with master, give user the option to install wordpress