Compile #207 and remove redundant padding.  Was causing issue.
Update to FontAwesome 4.2.0 fix #212
Merge remote-tracking branch 'upstream/master'