removed unused spec file format from Guardfile
no need to require sinatra
update gems
Merge branch 'master' of ssh://github.com/thomas-mcdonald/qa
add missing counter_cache declaration
add dd in users#show to display user info
use html pipeline for about_me rendering
Extract out common pipeline logic into lib/pipeline
Merge branch 'master' into html-pipeline