Merge bower dev per issue #83