Merge pull request #16 from Archetype-CSS/dev

merge dev
Merge pull request #18 from Archetype-CSS/dev

README fix
Merge pull request #20 from Archetype-CSS/dev

update bower.json
update tests