Add Maven build as convenience for installing/deploying to a Maven repository

 * This Maven build is NOT include in the makefile - it is assumed you will run "mvn install" or similar
fixed conflict in .gitignore, added david's maven build file
Merge branch 'ddunwoody-add_maven_build'
Merge branch 'master' of https://github.com/cryptobiu/scapi