Merge pull request #12 from xtuple/master

Catch up.
Merge pull request #13 from xtuple/master

Catch up.
Fix problem with function having ambiguous signatures.
Merge pull request #66 from jrogelstad/master

swat.