add progress
add progress
Merge pull request #16 from justplainboulevard/implement_tagging

Implement tagging
fix rvm gem mess
refactor, DRY up modal forms
fix friendly_id issues
fix conflicts
Merge branch 'implement_tagging'

 Push-pull screw-up.
Merge pull request #18 from justplainboulevard/master

Fix push-pull screwup