Use throwaway branch and put fixes in good branches, closes #54