follow upstream changes
adjust guard spec to API change
version bump
* moved Rack stuff into rack directory
* moved the aspects into respective directory
* more guard fixes