added experimental refactor of no_conflic().  It uses the python builtin list.index() instead of search.
Merge branch 'master' of https://github.com/JoshMermel/Juggle-Transition