Merge stevehodgkiss/restful-routing/master into woodnathan/restful-routing/master