JWag and Estrada merge

Added rspec for comments and removed scaffold rspec for tags.