Makefile sanity
ignore fe;
switch back to master after build
-r
whitespace
make branch changes