added slugify function
Merge branch 'slugify-function'

* slugify-function:
  added slugify function

Conflicts:
	Rakefile