Merge remote-tracking branch 'origin/dev'
Include license in README, since it didn't get included automatically by Github.
Merge remote-tracking branch 'origin/master' into dev