merge inotify changes from @haykinson.
merge inotify changes from @haykinson.

jpoirier/stratux,egid/stratux,haykinson/stratux,ccicchitelli/stratux,ianmcmahon/stratux,iposva/stratux,AlexSzlavik/stratux,jpoirier/stratux,lbsmith/stratux,egid/stratux,ianmcmahon/stratux,haykinson/stratux,timami/stratux,ssokol/stratux,haykinson/stratux,haykinson/stratux,lukepalmer/stratux,iposva/stratux,ccicchitelli/stratux,heelix/stratux,stratux-fork/stratux,kdknigga/stratux,stratux-fork/stratux,AlexSzlavik/stratux,egid/stratux,stratux-fork/stratux,AlexSzlavik/stratux,phenning/stratux,AlexSzlavik/stratux,lbsmith/stratux,timami/PlaneSense,jpoirier/stratux,ccicchitelli/stratux,lukepalmer/stratux,heelix/stratux,lukepalmer/stratux,heelix/stratux,westphae/stratux,AlexSzlavik/stratux,timami/stratux,timami/stratux,ianmcmahon/stratux,lbsmith/stratux,ccicchitelli/stratux,timami/PlaneSense,cyoung/stratux,jpoirier/stratux,iposva/stratux,timami/PlaneSense,heelix/stratux,egid/stratux,westphae/stratux,stratux-fork/stratux,egid/stratux,westphae/stratux,phenning/stratux,ccicchitelli/stratux,timami/PlaneSense,westphae/stratux,AlexSzlavik/stratux,kdknigga/stratux,egid/stratux,timami/stratux,heelix/stratux,trippingly/stratux,ssokol/stratux,ccicchitelli/stratux,phenning/stratux,cyoung/stratux,cyoung/stratux,phenning/stratux,jpoirier/stratux,timami/PlaneSense,cyoung/stratux,trippingly/stratux,ssokol/stratux,jpoirier/stratux,timami/stratux,kdknigga/stratux,ianmcmahon/stratux,stratux-fork/stratux,cyoung/stratux,phenning/stratux,haykinson/stratux,lbsmith/stratux,westphae/stratux,heelix/stratux,timami/PlaneSense,trippingly/stratux,iposva/stratux,ianmcmahon/stratux,lbsmith/stratux,phenning/stratux,cyoung/stratux,lukepalmer/stratux,ssokol/stratux,kdknigga/stratux,stratux-fork/stratux,ssokol/stratux,westphae/stratux,iposva/stratux,lukepalmer/stratux,ianmcmahon/stratux,trippingly/stratux,timami/stratux,trippingly/stratux,kdknigga/stratux,lukepalmer/stratux,lbsmith/stratux,trippingly/stratux,kdknigga/stratux,ssokol/stratux,iposva/stratux,haykinson/stratux