Merge commit 'f5c3'
Cleaned up the exit code using the atexit module
Merge commit 'bb31' into gui
--amend
Revert "--amend"

This reverts commit 0d3231f3e1e71ed2200634d7b0852d1e6ae8adfb.

Oops... My bad :P
Fixed the accidental camelcasing
Merge commit '9f28' into gui
Command execution migration
Fixed an error with closed connections
Merge commit '51f4' into gui
Fixed an error with closed connections
Merge c07e from master
Merge conflicts :S Bane of Git not-knowers
Revert "Merge conflicts :S Bane of Git not-knowers"

This reverts commit 4503bdec4d514e996bc6ec5ae7951c6d6954d4cf.