Pulled latest master branch, merged with my existing files, including updated layout.erb with bootstrap framework.