Merge remote-tracking branch 'upstream/master'
Merge pull request #1 from mlinn/master

Added test framework
Merge branch 'master' of github.com:kiran-b/mongo-tools
Merge pull request #2 from mlinn/master

Testing spec file (for realz)
Merge branch 'master' of github.com:kiran-b/mongo-tools
Simplify error messages, and remove a needless conditional.

Add ability to flash messages with JavaScript
  To use:  flash($('#selector'), 'error', 'Message');
           param 1 => jQuery selector to prepend the error message.
           param 2 => log level [error, info, etc]
           param 3 => message to display

Add validation on the fly for anything that has class of formatted.
Merge branch 'master' of github.com:brandonblack/mongo-tools

Conflicts:
	Gemfile
	spec/spec_helper.rb
Get the insertion of flash messages safer.
Fix something that was already in spec/spec_helper.rb
Tidied up
Merge branch 'master' of github.com:brandonblack/mongo-tools
Merge pull request #48 from hoangelos/master

Add JSON validation on the fly capability
Merge pull request #3 from mlinn/master

RSpec tests for stats scheduler
Merge branch 'master' of github.com:kiran-b/mongo-tools
[Query Analyzer] Improve indexes suggestion fucntion
Improve tests to use Capybara's waiting mechanisms
Merge pull request #53 from drcapulet/master

Improve tests to use Capybara's waiting mechanisms
Update lib/query_analyzer/evaluator.rb

add missing parens
Merge pull request #52 from macworld/master

[Query Analyzer] Improve indexes suggestion fucntion
Merge remote-tracking branch 'upstream/master'