Formatted code to use 4 space indents (no tabs)

Agreed upon indent by David and I
Format a few more files
Merge pull request #38 from moroni-pickering/master

Formatted code to use 4 space indents (no tabs)