Resolved problem with si when gem is istallated
Merge branch 'master' of https://github.com/swalf/BiodataFinder

Conflicts:
	app/public/favicon.ico
	app/public/images/logo.png
	app/views/about.slim
	app/views/es_error.slim
	app/views/home.slim
	app/views/layout.slim
	app/views/nav.slim
	app/views/not_found.slim
	app/views/results.slim
	app/views/styles.scss
	bin/bdf-si
	biodatafinder.gemspec
	lib/biodatafinder/public/favicon.ico
	lib/biodatafinder/public/images/logo.png
	lib/biodatafinder/views/about.slim
	lib/biodatafinder/views/es_error.slim
	lib/biodatafinder/views/home.slim
	lib/biodatafinder/views/layout.slim
	lib/biodatafinder/views/nav.slim
	lib/biodatafinder/views/not_found.slim
	lib/biodatafinder/views/results.slim
	lib/biodatafinder/views/search.slim
	lib/biodatafinder/views/styles.scss
	public/favicon.ico
	public/images/logo.png
	views/about.slim
	views/es_error.slim
	views/home.slim
	views/layout.slim
	views/nav.slim
	views/not_found.slim
	views/results.slim
	views/styles.scss