Make things more consistent, fix changing props
Merge pull request #3 from petehunt/master

Break underscore dependency, support changing props