Many commits in one commit, whoopsies.
Merge pull request #1 from motzyball/master

Many commits in one commit, whoopsies.