Font awesome 3.0

Hey Lorenzo. Here are some proposed changes and additions to your pull request branch. If you accept this pull request then it should in turn update your pull request to my repo with the changes. I can then also merge your pull request.