Revert "Merging in latest master changes"
Merge pull request #2 from Altiscale/revert-1-master

Revert "Merging in latest master changes"