Use bin and data directory heirarchy
Merge branch 'devel' of https://github.com/dkj/p4 into dkj-devel
Merge branch 'dkj-devel' into devel