Font Awesome upgrade v2

I started with 1d8a522, since we merged that commit earlier – Github thinks I need to do a rebase. Already tried doing a rebase, not sure how I can get this to merge automatically.