Install bootstrap and font-awesome from gems

Often, it's much easier to update assets such as Bootstrap and Font-Awesome when they are installed from gems rather than source. Install bootstrap from anjlab/bootstrap-rails and Font Awesome from  bokmann/font-awesome-rails
Merge remote-tracking branch 'davidcelis/patch-1'

Conflicts:
	template.rb