Merge branch 'release/1.0.0' into develop
Add reserved slug configuration option
Merge branch 'master' into develop
need more logic when dealing with reserved slugs and uniqueness
fixes #3
Fix for #5
Also ask for trashed items when checking for slug collection.
Merge branch 'master' of git://github.com/slovenianGooner/eloquent-sluggable into feature/include_trashed

Conflicts:
	src/Cviebrock/EloquentSluggable/Sluggable.php
remove merge cruft
use base_slug
Merge branch 'feature/include_trashed' into develop
update Changelog
Follow Laravel coding standards and try and maintain some whitespace consistency
add Todo file
add title
fixes #9
Merge branch 'release/1.0.2'