Squashed commit of the following:

commit 54c57a73c2b5814ccfd33c7447323409a16b48b7
Author: David Yan <david@datatorrent.com>
Date:   Fri Dec 13 16:49:56 2013 -0800

    added javadoc

commit f7050508c0743b9a6e5e2024cffc04e897e71746
Merge: 6c7a054 689796b
Author: David Yan <david@datatorrent.com>
Date:   Fri Dec 13 16:48:53 2013 -0800

    Merge branch 'issue488_pull' into issue488_pull2

commit 689796bb8e4a89b4b6eb8187957fbc3b49e8edca
Author: David Yan <david@datatorrent.com>
Date:   Fri Dec 13 15:33:41 2013 -0800

    fix #488 added delay before reconnection