Installer Refactor #1

Merged
merged 4 commits into from Jan 12, 2012