#4 - Fixing AGAIN.  I suck at copy and paste.
Merge branch 'master' of https://github.com/TDMobility/DoctrineEncryptBundle into #4