Merge pull request #3 from curlee/master

Various improvements
adding demosite to ignore
Merge branch 'master' of github.com:cmcavoy/openbadges-displayer.js
Merge pull request #12 from curlee/master

more issue fixes
Merge pull request #17 from curlee/master

Fixes 3 issues
resolving gitignore conflict
dist update
dist update
updated demo to match old style
Merge branch 'master' of github.com:curlee/openbadges-displayer.js