Bootstrap fixes

A few small fixes I made while trying to get bootstrapped.

I changed the line endings because it's"friendlier" to unix developers to have files committed to the git repo with LF's instead of CRLF's for line endings.  This won't affect Window's developers who have their [git set up correctly](http://git-scm.com/book/en/Customizing-Git-Git-Configuration#Formatting-and-Whitespace).