Moar style fixen

Signed-off-by: Alan Gardner <alan@armoin.com>
Merge branch 'master' of github.com:urfolomeus/edinburgh_stories

Conflicts:
	app/assets/stylesheets/temporary.css.sass
Some style fixes

Signed-off-by: Alan Gardner <alan@armoin.com>
Converting from HAML to ERB

Signed-off-by: Alan Gardner <alan@armoin.com>
Missed a few
Removing HAML altogether

Signed-off-by: Alan Gardner <alan@armoin.com>