Added configuration for some other hosts
Cleaned up some configurations of installer
Merged extras with elementary