Fixing Errors in build / merge of master
Merge branch 'issue-343-military-time' of https://github.com/ExactTarget/fuelux into issue-343-military-time