Fix several ambiguity warnings on 0.4 (due to Dates)
Merge branch 'master' into teh/dates

Conflicts:
	src/SIUnits.jl
Merge pull request #39 from timholy/pull-request/d719c285

Fix several ambiguity warnings on 0.4 (due to Dates)