Merge branch 'master', remote branch 'upstream/master'
added note about callable column default only being called once
Merge pull request #27 from tisdall/master

Added note about callable column default in docs.