Merge branch 'dev'
Update README
Tidy up formatting a little
Use Sass nesting rather than verbose, vanilla nesting