Merge branch 'master' of git://github.com/nclark/annotate_models

* 'master' of git://github.com/nclark/annotate_models:
  adding option to not annotate tests or fixtures