Update of PR #25, with Bower update

This updates PR #25 and resolves some merge conflicts since then.

It also adds in `intl-messageformat` as a Bower dependency, since it's already since been published to Bower.
ok