Font awesome 3.0, working on asset pipeline
Merge branch '2.0' of github.com:/papodaca/rock into 2.0