Removing unused pillar sls from pillar top file
Cleaning up the name of things with the addition of random generated
string.

The master instance will become magento-<random string>-master
The haproxy instance will become magento-<random string>-haproxy
The db instance will become magento-<random string>-db
The web instances will become:
    magento-<random string>-web-<random string>

Added some additional outputs to aid in finishing the magento
installtion.
Fixed typos, altered output, made flavor an input parameter
Merge branch 'icehouse'