More OCD tweaks
Merge branch 'master' of github.com:brianstebar2/bacs-fs
Made everything compile with the Makefile and cleaned up compiler warnings