Merge branch 'master' of https://github.com/hassankhan/emojify.js into develop
Merge branch 'develop' of https://github.com/hassankhan/emojify.js into develop
Assets are stored under /dist now
Added "gulp clean" to clean dists & unignored CSS
Added gulp bump task
Moving images & dev JS file into /src & copying images to /dist
Merge pull request #95 from adam-lynch/dist

Moving the dists to /dist
Merge pull request #97 from adam-lynch/bump

Conflicts:
	gulpfile.js
	package.json
Pulled from upstream