1 to M for User Bookmarks working
Rails_Admin locked down, ok method, could be improved...
Mailers added, only minorly configured
Tan changes to index show bookmark_controller for Tagging and sorting and Twitter changes
Added Tans mods for the bookmarks controller
Bookmark controller changed
fixed typo of pwd
Merge branch 'master' into Tan_0509
Getting Tans branch up to date
Merge branch 'master' into Tracy_Thurs . Merging Master into Tracy.