can't remove this, can't keep it and be error/merge-free. So annoying
ok, I think I've almost properly got this maven thing now... This is painful to come back to after a while.
updated this little monster again
right. That settles maven and a setup-independant config file (I hope). All of the references are relative to configured directories (ie java.home) or point to central repositories (ie maven). right click on project -> maven -> update project will fix things if there are build errors (eg the classpath is missing or something is badly configured). The hotkey for this should be alt+f5, the plugin for maven (m2eclipse) is in eclipse by default I think.
Merge commit 'da7fbf796ab0be87990709bec57539c926055561' into develop