Don't add "http://" to urls beginning with https.
Merge branch 'master' of github.com:cgag/bookmarking

Conflicts:
	src/bookmarking/handler.clj
	src/bookmarking/models/url.clj
	todo.txt