updates to config for dir-specific configuration
added rspecs; integrated with rails
merge