removed the default distro parameter since it nullifies the template-file parameter
Merge pull request #50 from bdupras/master

added secret-file option for bootstrapping
Merge pull request #51 from kirtfitzpatrick/distro-default

removed the default distro parameter
version bump for all of the recent merges
reformatting tab/space noise