http
Merge branch 'master' of https://github.com/SeanShubin/up-to-date

Conflicts:

conversion/src/main/scala/com/seanshubin/up_to_date/conversion/Conversio
n.scala