Merge with remote at https://bitbucket.org/instedd/nuntium