Cleaned up commented out code.  Pulling master branch of chef-dokku