make the header elpa compatible
update some macros to indent properly.
with-pg-connection needs apply not ,@
Merge pull request #1 from nicferrier/master

clean up for packaging?