Merge nickw's fork

As discussed in https://trello.com/c/lrLKcZum/2-pull-request-nick-s-version-to-differential-s-master-differential-meteor-boilerplate