modifying gitignore to ignore emacs versions
first pass at bootstrap variable display
Merge branch 'structural_refactor'

Conflicts:
	recollection/templates/messages/base.html
	recollection/templates/site_base.html
updating code base to support incremental pass of bootstrapping template / functions
Merge remote-tracking branch 'upstream/master'
updating codebase for bootstrap 2.2.2 and dealing with refactoring
removing files based on refactoring
(re)adding viewshare thin logo based on refactoring - new logo for supporting thin header
new header for thin design
updating views to support better bootstrap form control
updating from uniform to crispyforms (with Bootstrap set as default) and adding inital modal + crispy test editing user profiles
updating codebase to support new canvas / template modal
Merging erimille/bootstrap
updating to support facet widget modal structure
updating facet widget model layout for better, constent flow
added bootstrap modal for view lens selection
updated canvas modal structure to align with other bootstrap modal and added consistency of style
Merge branch 'master' of github.com:zepheira/recollection

Conflicts:
	.gitignore
	freemix/templates/dataset/base.html
	viewshare/templates/profiles/profile.html
connecting facet and view modals to functionality. views complete, list facet structure in place, but other facets require work on structure, style and triggers.
functional list facet editor