Merge pull request #7 from danlurie/master

More conflict resolution (in config window)
added dual regression
Re-organized pages to be more user friendly