Manual Merge from @joshuha master

Changed hosting to raw.github.com.