Merge branch 'dev'

Conflicts:
	History.md
	README.md
	casbah-dynamic/project/build.properties
	casbah-dynamic/src/main/scala/DynamicDBObject.scala
	tutorial_src/source/setting_up.rst

.gitignore

@@ -1,18 +1,21 @@
-target/
-reports/
+*.iml
+*.swp
+.cache
+.classpath
+.DS_Store
+.history
+.idea
+.lib
+.project
+\.idea/workspace.xml
+atlassian-ide-plugin.xml
+casbah-dynamic/project/boot
+casbah-dynamic/project/plugins/project
+java_pid*.hprof
 lib_managed/
-src_managed/
 project/boot/
 project/plugins/project
-casbah-dynamic/project/boot/
-casbah-dynamic/project/plugins/project
-java_pid*.hprof
-*.swp
+reports/
+src/sphinx/_build
 tags
-\.idea/workspace.xml
-tutorial_src/build
-atlassian-ide-plugin.xml
-.idea
-*.iml
-.project
-.classpath
+target/

.travis.yml

@@ -0,0 +1,23 @@
+# See http://about.travis-ci.org/docs/user/build-configuration/
+language: scala
+scala:
+  - 2.10.0-RC5
+  - 2.9.2
+  - 2.9.1
+  - 2.9.0-1
+# Branches to test
+branches:
+  only:
+    - dev
+# use the local sbt rebel cut
+script: ./sbt ++$TRAVIS_SCALA_VERSION test
+notifications:
+  email:
+    recipients:
+      - ross@10gen.com
+jdk:
+ - openjdk6
+ - openjdk7  # Currently failing with requirements
+ - oraclejdk7
+services:
+  - mongodb

AUTHORS

@@ -0,0 +1,26 @@
+The PRIMARY AUTHORS are (and/or have been):
+
+Brendan W. McAdams
+Ross Lawley
+
+CONTRIBUTORS
+
+Dervived from the git logs, inevitably incomplete but all of whom and others
+have submitted patches, reported bugs and generally helped make Casbah
+that much better:
+
+* Novus Partners, Inc. <http://novus.com> Original sponsors of this casbah prior to Version 2.0
+* Max Afonov <max@bumnetworks.com>
+* Marcello Bastéa-Forte <marcello@cellosoft.com>
+* Philip Wills <otherphil@gmail.com>
+* Ben Gamari <bgamari@gmail.com>
+* Patrick Bohan <arkban@arkban.net>
+* Jon-Anders Teigen <@jteigen>
+* Bryan J Swift
+* Thibault Duplessis
+* Gerolf Seitz
+* Hitoshi Asai
+* Ilya (intracer)
+* Tom Vaughan
+* Brennan Saeta (saeta)
+* Eugene Wolfson (yegeniy)

CONTRIBUTING.rst

@@ -0,0 +1,51 @@
+Contributing to Casbah
+======================
+
+Casbah has a growing `community
+<https://github.com/mongodb/casbah/blob/master/AUTHORS>`_ and
+contributions are always encouraged. Contributions can be as simple as
+minor tweaks to the documentation. Please read these guidelines before
+sending a pull request.
+
+Bugfixes and New Features
+-------------------------
+
+Before starting to write code, look for existing `tickets
+<https://jira.mongodb.org/browse/SCALA>`_ or `create one
+<https://jira.mongodb.org/browse/SCALA>`_ for your specific
+issue or feature request. That way you avoid working on something
+that might not be of interest or that has already been addressed.
+
+Supported Versions
+------------------
+
+Casbah currently supports Scala 2.9.X.
+
+Style Guide
+-----------
+
+Casbah aims to follow the
+`Scala style conventions <http://docs.scala-lang.org/style/>`_ including 2
+space indents and 79 character line limits.
+
+General Guidelines
+------------------
+
+- Avoid backward breaking changes if at all possible.
+- Write inline documentation for new classes and methods.
+- Write tests and make sure they pass (make sure you have a mongod
+  running on the default port, then execute ``./sbt test``
+  from the cmd line to run the test suite).
+- Add yourself to AUTHORS.rst :)
+
+Documentation
+-------------
+
+To contribute to the `API documentation <http://api.mongodb.org/scala/casbah/current/>`_
+just make your changes to the inline documentation of the appropriate
+`source code <https://github.com/mongodb/casbah>`_ or `rst file
+<https://github.com/mongodb/casbah/tree/master/tutorial_src>`_ in a
+branch and submit a `pull request <https://help.github.com/articles/using-pull-requests>`_.
+You might also use the github `Edit <https://github.com/blog/844-forking-with-the-edit-button>`_
+button.
+