Removed KeepAlive in launchctl plist for OS X
Merge branch 'dev'