upgraded everything
Merge pull request #5 from devoncarew/cleanup

upgraded everything