Fixed compilation problems on Linux.
Merge branch 'FixWindowsCompilation' of github.com:BlakeNelson/ElVis into FixWindowsCompilation