Fix a couple of mistakes
Merge pull request #683 from rlerdorf/master

Fix a few minor mistakes
Fix some issues. Closes #684
Foreign Keys default behaviors managment (resolves issue #390)
Fix CS