install iron router
Merge branch 'chrbradley-meteor' into meteor

fix merge conflict