Made some changes in the new "testing" branch.
Removed that junk I added for branch testing.
Merge pull request #1 from dustinmhorvath/testing

Looks like it's working.