Merge pull request #14 from ledgersmb/1.4

1.4, bringing it up to date
Marking 1.4 as a long-term branch

--HG--
branch : 1.4
Merging COGS type fix from master

--HG--
branch : 1.4
Adding in missing pg-database.sql fix

--HG--
branch : 1.4
Merge pull request #104 from einhverfr/1.4

Merging in fix for cogs types from master.