Squashed commit of the following:

commit 558d5c9da0de42cc21fb225b3278f2e5bc6e36a2
Author: JBaltika <jim@genuineinteractive.com>
Date:   Mon Dec 2 00:54:50 2013 -0500

    Code clean up

commit 1e33df29bdbc39c4323d41770ec151efa6779277
Author: JBaltika <jim@genuineinteractive.com>
Date:   Mon Dec 2 00:53:24 2013 -0500

    Code clean up

commit 8319c87e08830781d5fb53986e1a39d09c362fc6
Author: JBaltika <jim@genuineinteractive.com>
Date:   Mon Dec 2 00:05:50 2013 -0500

    code clean up
code clean up
Merge branch 'master' into develop