Merge pull request #8 from cadamo/master
Change the location of the Javelin source to facebook/javelin