Random all over the place updates
Merge pull request #51 from travisvalentine/more_updates

Random all over the place updates