Upstream from ebryn master, post install and bower update (tests passing)