fontawesome bundled in ckeditor causes conflict with newer versions of fontawesome in rails

I have ckeditor-rails and font-awesome-rails in my rails app. font-awesome-rails uses fontawesome 4.4. 

I am getting problems with my icons, where clicking on them causes the icon to change to a different fontawesome icon (always to angle-right first, then toggles between angle-right and angle-down). See bokmann/font-awesome-rails#150 for more details. 
