Too many changes to enumerate, really
Merge pull request #1 from twelve13/master

Too many changes to enumerate, really