Fixes #18 - Changed trunk version to dev-trunk
As mentioned in #18, time is valuable when dealing with trunk packages
Merge pull request #25 from lavoiesl/trunk-version-fixes

[Feature] Trunk version fixes