Add conditional to wpm display
Remove unecessary test
Merge pull request #64 from tiger-swallowtails-2014/fix_wpm_display

Add conditional to wpm display