Supportive 20141104 rc

Refactor using some Active Support goodness.