Fixed error with module name; moved tests into test modules with #[cfg(test)] directives
Merge remote-tracking branch 'upstream/master'

Conflicts:
	curl/curl.rs
	rust_curl.rc