BUG: move merge-pr.py to scripts/ and fix bug

Author: wesm

merge-py.py renamed to scripts/merge-py.py

@@ -233,7 +233,7 @@ def fix_version_from_branch(branch, versions):
 branch_names = filter(lambda x: x.startswith("branch-"),
                       [x['name'] for x in branches])
 # Assumes branch names can be sorted lexicographically
-latest_branch = sorted(branch_names, reverse=True)[0]
+# latest_branch = sorted(branch_names, reverse=True)[0]
 
 pr_num = raw_input("Which pull request would you like to merge? (e.g. 34): ")
 pr = get_json("%s/pulls/%s" % (GITHUB_API_BASE, pr_num))