named relations
some docs for relationship macros
relationship name can be passed to with macro
fix the handling of options
revert version number to make pull request cleaner
Merge pull request #124 from vgeshel/master

User-specified naming strategies don't work
update version in readme
whitespaces removed
whitespaces removed from test/core
Merge branch 'named_relationships' into no_whitespaces_and_named_relationships_

Conflicts:
	src/korma/core.clj
added tests for named relationships
configured TravisCI
Support nested transactions with MYSQL.
If you are in a nested transaction you already have a connection open. Trying to open another connection will block and error with: java.sql.SQLException: Lock wait timeout exceeded; try restarting transaction.
Instead test if there is a connection already open and don't open another if there is one present.
Merge pull request #130 from josephwilk/master

Bug: Nested transactions deadlock with MYSQL.
Testing transactions requires mysql.
Ensure we setup and tear down a test mysql db for this test.
Ensure entity is connected to the right db
Revert "Support nested transactions with MYSQL."

This reverts commit cdcd605406b8d3cb739ce786986473bf4456c735.
Revert "Revert "Support nested transactions with MYSQL.""

This reverts commit 11f67cca60c03221829ddf83240e67d515feced9.
Merge pull request #131 from josephwilk/master

Fixing Travis build
clean project file