Grunt
MMerge branch 'master' of github.com:nathankot/linkify.js

Conflicts:
	Gruntfile.js
Merge branch 'master' of github.com:nathankot/linkify.js

Conflicts:
	.gitignore