Add -s short opt to getopt. Whoops.
Fix travis failures for older gcc(4.6.3) and clang(3.4)