Update KeePassX 2 for new naming conventions
Merge pull request #11 from Cottser/keepassx-2

Update KeePassX 2 for new naming conventions