Changes whitespace just to test travis on mde/master
Adds node 0.10 to .travis
Fix mutual deps problem
Merge branch 'master' of github.com:mde/model
fixed merge conflicts