Working on getting message editing to work
Edit still not working. Getting frustrated.
V1 of chat update working!
Clean up message edit code
Working on UI for displaying edit and history
everything actually works now
the history display is looking better
a bit more semantic html
Happy with all functionality
Formatting files I effed up
More formatting fixes
Hopefully last formatting fix
Merge remote-tracking branch 'upstream/master'

Conflicts:
	assets/app/room/InputController.js
	assets/app/room/room.html
	assets/styles/bunker.css
	package.json

But I took care of them!
Room.html for message history fix

Moved the history stuff outside of the message class. It needs to
overflow the div.
Fix message mention css bleed
removed useless watches
Fixed css for displaying edit indicator
Fixed history pop for bottom messages.
Merge bunker/main
Added color indicator when editing