edu.berkeley.cs.amplab => .shark
Exclude Datanucleus for assembly only.

Also some cleanup.