minor fixes, more idomatic bb code
adding bootstrap-tours gem
merge conflict