Update Fontawesome, add two-50 css
Update info file for use with latest Mothership 2.x dev
Merge pull request #23 from mlabrecque/7.x-1.x

Added Bundlr support.
Update Gemfile
Update README.md
Fix for Parrot Styles removing Pane Title
Merge branch '7.x-1.x' of github.com:bmx269/parrot into 7.x-1.x
Merge conflict resolved.