Little commit fixing up some spacing per our norms:

No space before : for type,

space after "," between types, but not before
Merge pull request #319 from twitter/formattingFixup

Little commit fixing up some spacing per our norms:
Adds in the Scalariform plugin to keep consistency
Auto-formatted
Merge branch 'feature/autoFormatter' into tmp
Reformatted
Merge branch 'tmp' into feature/autoFormatterRan
Merge pull request #321 from twitter/feature/autoFormatterRan

Feature/auto formatter ran
Bump to 2.10.4 in travis
Merge pull request #323 from twitter/bump-travis-2.10.4

Bump to 2.10.4 in travis
Was a missing call to the update if we had flushed. Now we just do it as part of finishing the flush. Daisy chain it onto the end of the flush future.
Eagerly trigger the timer update -- if the flush takes a while we don't want to double flush in quick succession.
Merge pull request #324 from twitter/feature/fixSummerBug2

Daisy chain update onto the end of the flush future.