Squashed commit of the following:

commit b0ee820ab5c11af647dadd284ee6fda7a18510ce
Author: Arvind Naidu <arvind.raj.naidu@gmail.com>
Date:   Sun Apr 13 01:20:09 2014 -0700

    Added file transfer

commit d05fe2547fba3c5e0db8d9a10f4bfe2a8e2fbcad
Author: Arvind Naidu <arvind.raj.naidu@gmail.com>
Date:   Wed Apr 9 20:59:03 2014 -0700

    Implemented repeated handshakes that may be obsolete