Merge pull request #1 from tgstation/master

General Purpose Update Pull
Merge pull request #2 from tgstation/master

Merge pull request #2 from tgstation/master
Merge pull request #3 from tgstation/master

GPUP 6-7-14
Merge pull request #4 from tgstation/master

Merge pull #4 from tgstation/master
Merge pull request #5 from tgstation/master

more updates
Merge pull request #6 from tgstation/master

quick pull from tgmaster to try and work on these fucking conflicts
fix for #4243, adds notification

squashed commits
Merge pull request #4289 from cookingboy3/asay

Admin notification when emitter loses power.