bower adds
Merge pull request #9 from draycox/new_branch

bower adds
Merge branch 'joey6'
Merging Joeys
updates to bower stuff
Correct merge conflicts with Joey 7 and master
Merge branch 'master' into joey7