Bumping versions to next SNAPSHOT
Adding what I hope solves all of the context and template directory issues
Merge branch 'issue5'