Merge branch 'master' into meteor-file-watcher
Merge branch 'meteor-file-watcher' of https://github.com/xolvio/velocity into meteor-file-watcher
update dependencies