Just a test commit
I edited a comment
Everything from milestone7
Merge pull request #1 from Tiritium/testing

master is now up to date with 4/9/14