Squashed commit of the following:

commit bc301b7f7f51d36f44ca7686d5504e88eb68db58
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Fri Sep 20 14:18:56 2013 -0400

    Test commit

commit 946b3e48bca0075458bd353fdfa41956fd888b31
Merge: e312663 1f7d52d
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Fri Sep 20 14:18:36 2013 -0400

    Merge branch 'master' into develop

    Conflicts:
    	git-flow-develop

commit e3126639f9ac5994f2a3f11cdc4fec56849a6ab8
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Fri Sep 20 14:13:10 2013 -0400

    Checkout to develop after pushing to master

commit ef9470d34987f28ede8006f8c2becb2efad00af5
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Mon Sep 9 15:10:52 2013 -0400

    Make the git-flow-develop non executable

commit a932b94b04d05675e255cf8fa267c691d61f0767
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Mon Sep 9 15:01:55 2013 -0400

    Fixed the makefile

commit 1b0ed3ba54449f86ee210637d2fb4584d9f80081
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Wed Aug 21 15:10:02 2013 -0400

    Removed the check for the develop branch.

    Figured having the is_develop_configure check is enough.

commit 1863e75deec1c1ce83f852058202e61d62ceb7f5
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Wed Aug 21 15:08:27 2013 -0400

    Added executable permissions to git-flow-develop

commit 6921f746d101a4ac8f6bc96cb6a3e01e28211748
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Wed Aug 21 15:08:00 2013 -0400

    Added some additional checks to develop.

    To ensure that the develop branch exists and is configured.

commit 1fe5991895df93f1d6aa6d8f1df0a8eb46642eb7
Author: Varun Vijayaraghavan <varun.kvv@gmail.com>
Date:   Wed Aug 21 14:57:32 2013 -0400

    No need to merge twice.
Merge remote-tracking branch 'origin'

Conflicts:
	git-flow-develop