remove need for mysql password in command line (shows in htop)
Merge remote branch 'upstream/master'
Use jonnyboy monitor.php as previous merge broke it
Merge remote branch 'origin' into dev
Merge branch 'dev' of https://github.com/househead/newznab-tmux into dev