Update argot to 1.0.3 which is now in maven central

Also removed the resolver that was added as workaround
Merge branch 'magro-master'