Update FontAwesome to 3.1.1 using the correct vertical alignment from leberwurstsaft.
Add newline to .gitignore
Set minimum deployment target to iOS 5.0 in podspec
Merge remote-tracking branch 'upstream/master'