Merge branch 'master' of github.com:OpenTreeOfLife/phylografter into …

…remove-legacy

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

controllers/snode.py

@@ -49,7 +49,7 @@ def update_snode():
             if data.get('ingroup'):
                 db(db.snode.tree==rec.tree).update(ingroup=False)
 
-            userName=' '.join([auth.user.first_name, auth.user.last_name]
+            userName=' '.join([auth.user.first_name, auth.user.last_name])
             for k,v in data.items():
                 db.userEdit.insert(userName=userName,
                                    tableName='snode',