Squashed commit of the following:

commit 0afc7d39506e52b7d1fa71b253e87436208d20f1
Author: Javed Khan <javed@agiliq.com>
Date:   Thu May 16 20:07:35 2013 +0530

    added ogone secret keys

commit 4c9bf390f645a5bc566a1cf639049ff65beef567
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Thu May 16 19:08:45 2013 +0530

    add ogone tests

commit 21e629b69e47fc0c70e9aa5cd373083630eb2ba6
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Thu May 16 17:35:11 2013 +0530

    remove merge conflicts

commit 00e26ff56591560dee8d39e0c31e374b59213394
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Thu May 16 17:25:18 2013 +0530

    move data(fields) to view

commit 54171a0840306e2382d611dc9dcdab937c72c4d8
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Thu May 16 17:16:12 2013 +0530

    add ogone payment form

commit 1c2dc8d8ea94fbf66f4b939f6c8b6c97d0e8cd0e
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Thu May 16 17:15:38 2013 +0530

    add util fn`s

commit 4c229e62d22e8c18ba11722202f3249b9aebdbaa
Author: Venkata Ramana <arjunchitturi@gmail.com>
Date:   Thu May 16 01:56:15 2013 +0530

    add payid to cancel template

commit 3b480c91ca0d32e883275dd204c006797becc459
Author: Venkata Ramana <arjunchitturi@gmail.com>
Date:   Thu May 16 01:20:21 2013 +0530

    fix: use caps for STATUS feedback param

commit ba553fd43e3039c4383cb0e92b3480dce2644487
Merge: c7a6801 6152ae1
Author: Venkata Ramana <arjunchitturi@gmail.com>
Date:   Wed May 15 23:31:03 2013 +0530

    Update with upstream: Merge branch 'master' of https://github.com/agiliq/merchant

commit c7a680194e95f1c05ae259241e27b0908ee97047
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Wed May 15 19:29:56 2013 +0530

    add success, failure, cancel templates

commit 55b287466e6ed8d9543be6ad7f809c0ae1774d42
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Wed May 15 19:28:18 2013 +0530

    add ogone settings

commit f4d672f2294bd853dc49974e29b3080cf9763c67
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Wed May 15 19:26:45 2013 +0530

    add django_ogone to reqs

commit 8976dcc27b6b541c83563480c07b6080b58ccf18
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Wed May 15 19:26:04 2013 +0530

    import ogone obj and use in ogone view

commit 97d4d3f0538953f7d629e2db52524567b157444c
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Wed May 15 19:25:03 2013 +0530

    add ogone urls

commit 41649615666bdb30e52798c76f1ba1d4b5e999f9
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Wed May 15 19:24:20 2013 +0530

    use billing tags instead of ogone tags

commit ca0f3eb729da8186d6295256b7d9e865b81cabe5
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Wed May 15 19:22:45 2013 +0530

    add ogone link in base

commit 4d5b163a1c36b307a119575c83e345e6cca1d086
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Wed May 15 19:21:11 2013 +0530

    set int for status and use nofify handler in data

commit 6e6343e21bdb7a7e9e5708470a43058442f24499
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Wed May 15 19:18:56 2013 +0530

    1. add notification handlers to handle success, failure, cancel cases.

commit e21362646f520543beaca3695042846d74595645
Merge: d39a94c 506c535
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Tue May 14 14:44:39 2013 +0530

    merged latest changes

commit d39a94ce17452b854ee48e1fa5ccac8ab14d0535
Author: arjunc77 <arjunchitturi@gmail.com>
Date:   Mon Apr 30 20:19:50 2012 +0530

    adding sample localsettings

commit d2af20241d64eb3ccc07d69575b2ddde414999c5
Author: arjunc77 <arjunchitturi@gmail.com>
Date:   Mon Apr 30 20:18:32 2012 +0530

    pass ogone settings as a Bunch to be compatible with module

commit 02ab4fa13dca4c723b9010b24736ea0094dc03ff
Author: arjunc77 <arjunchitturi@gmail.com>
Date:   Mon Apr 30 20:16:06 2012 +0530

    addin ogone test case file

commit 0f469611c84bea81fadde7738e363778d9e114d7
Author: arjunc77 <arjunchitturi@gmail.com>
Date:   Mon Apr 30 20:11:31 2012 +0530

    new repo for django-ogone

commit 05d159b24ecabc2295098db2942050ce98166b96
Author: arjunc77 <arjunchitturi@gmail.com>
Date:   Mon Apr 30 20:06:41 2012 +0530

    adding failed ogone payment

commit 4f434a2f5a8944215fcbcaca60d814fe61a67739
Author: arjunc77 <arjunchitturi@gmail.com>
Date:   Mon Apr 30 20:05:34 2012 +0530

    adding django_ogone to settings, OgonePaymentTestCase

commit 649b4f37602c18809bfac7d1a08ffcc955dc23b1
Author: arjunc77 <arjunchitturi@gmail.com>
Date:   Mon Apr 30 20:03:13 2012 +0530

    adding ogone payment tags

commit edeb9ee8055b4fd1aa4b93a63d022afae035b95d
Merge: cd98d80 e3cb5f3
Author: arjunc77 <arjunchitturi@gmail.com>
Date:   Fri Apr 27 18:22:12 2012 +0530

    Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	example/localsettings.example.py

commit cd98d802b16cb0e177cda103ff25d38eb1d2783e
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Fri Apr 6 19:31:09 2012 +0530

    importing ogone module

commit 0298ae4c03aad47970e09c8c3ac72fbd10d54331
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Fri Apr 6 17:14:07 2012 +0530

    add ogone integration initial file

commit 1eb4eb5e673ac221026f55718b13bac9ec9074f7
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Fri Apr 6 17:12:06 2012 +0530

    adding ogone link to base

commit ddda1913b15f70271a82d9430bb2e21e476d2a3f
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Fri Apr 6 17:11:30 2012 +0530

    add ogone offsite url

commit 6af613e6ae42bbf01407fb4cefbd53af62aa7414
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Fri Apr 6 17:11:06 2012 +0530

    adding ogone offsite

commit 608f022ac7d98ffcdc20850f4c828d7a2e03356b
Author: Venkata Ramana <ramana@agiliq.com>
Date:   Fri Apr 6 16:55:37 2012 +0530

    adding initial ogone workings
adding @arjunc77 to contributors
use merchant test mode instead of settings debug
resolved conflicts and merge upstream