beef up ginkgo options
more lenient updating with go 1.4