continual merge of Tom's style into sass framework
Merge branch 'master' of https://github.com/rhastings-epigeum/EpigeumDev