Minor gem tweaks
Updated font-awesome and markup
Added include_file to allow mixing in file-based templates