Merge pull request #42 from dougmassay/master

Tweaks for building/installing on Linux.
feed back for qt5.4 changes for building.