Adding archiva for deployment
Merge remote-tracking branch 'matt/archiva'
changing version number