Change generated code to not require macros (for IntelliJ compat)
Modify wrong sentence.
Workaround for HList compilation problems in Scala 2.10.3, 2.11.0-M7.

Related to issue #577.

Changing hconsShape as per Paul's suggestion in
https://issues.scala-lang.org/browse/SI-8146 avoids the spurious type
errors and non-termination issues in the minimized test case.
Merge pull request #606 from cailhuiris/master

Modify wrong sentence.
Merge pull request #609 from slick/tmp/hcons-shape-workaround

Workaround for HList compilation problems in Scala 2.10.3, 2.11.0-M7.
Merge pull request #595 from slick/tmp/remove-macro-dependency

Change generated code to not require macros (for IntelliJ compat)
Merge remote-tracking branch 'origin/pr/615'

- Remove extra spaces in connection.rst links
Update build for 2.0.0 final
Pass Slick version properly from sbt into Sphinx.

sbt-site automatically sets 'release' and 'version' properties for
Sphinx but these are only visible in .rst and template HTML files
whereas conf.py uses its own version and release defined there. This
required updating the version numbers in conf.py for every release
and, due to the way the short 'version' is computed from the proper
'release' by sbt-site, lead to issues such as the Slick 2.0.0 docs
showing only '2.0' instead of '2.0.0' in the title.

Upgrading to sbt-site 0.7.1, disabling the automatic version properties
passing, and passing them manually through env variables into conf.py
should fix this once and for all.
Merge pull request #617 from slick/tmp/consistent-doc-versions

Pass Slick version properly from sbt into Sphinx.
Merge remote-tracking branch 'upstream/master'