Change to End Pour
More intelligently restart Faye
Added MGSplitViewController
Only call end_pour if the Pour is still active
Merge branch 'refs/heads/ipad'