slightly refactor aliases constructor
revert refactor of aliases constructor
revert refactor of aliases constructor
Merge branch 'master' of github.com:marcusklaas/backbonzo
update dependencies so it'll build on nightly again