merged passed context with everything else
Merge branch 'master' of https://github.com/mundizzle/dollarbars