Massive refactor

this pull request isn't quite as scary as it sounds.

It reflects my uncommitted work for the last couple of weeks to get swift included in the dev env. At a high level, it does the following:
- general house-keeping (make things prettier, delete unused code, etc..)
- add role for deploying puppetmaster (add capability to deploy roles as agents)
- add support for swift