Add -server to default aggressive jvm opts
Merge branch 'master' of github.com:aphyr/riemann

Conflicts:
	pkg/deb/riemann
	pkg/rpm/riemann
	pkg/tar/riemann