Haml/sass views

Merge work to date. Start feature branches.