Minified
Merge branch 'master' of github.com:mikermcneil/waterline2