Merged jeff's many changes and fixed issues
Merge branch 'jef'
Replaced tabs with spaces
Merge branch 'master' of git://github.com/JeffTolbert/612-2013 into jeff