Refactor Javascript for markers
Merge branch 'gh-pages' of github.com:zunda/emoticommits into gh-pages