Go back to base.haml over having 2 separate files

I knew it was a bad design, but actually using it in an app confirmed
how horrendous it was. Real WET. Yuck!

As far as the code goes, I just used some helpers that test for the
environment and dynamically generate the haml.
Use shared examples to keep spec DRY
Merge branch 'dev'