add markdown functionality to users, some minor css tweaks and removed a bootstrap from the Gemfile. may need to write some integration tests still and check ie7 compat.
Merge branch 'master' of github.com:enspiral/loomio

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/discussions.css.scss
	app/controllers/discussions_controller.rb
	app/views/comments/_comment.html.haml
	app/views/discussions/_add_comment.html.haml
	db/schema.rb
add cucumber tests to comment markdown settings
refactor markdown-settings, ajax. write cucumber tests
cleaned out unnecessary .activity from discussions css
cleaned one like from .activity-item-body in discussions.css
fixed migration of discussion and motions uses_markdown default. fixed spec
changed set_markdown to use save! and updated users_c spec.
remove extraneous conditional_markdown, remove markdown from votes
change _desciption to impliment markdown unless uses_markdown setting passed in
Merge pull request #448 from s01us/feature/markdown-toggle

Feature/markdown toggle