Merge branch 'master' of https://github.com/tyrbo/the_pivot
fixes dollar displays
fixes merge conflicts
Fixes merge conflicts