...
[15:45:42 CDT(-0500)] <EricDalquist> since the events stuff I just merged into master I know will cause my UP-3231 branch to not compile
[15:45:52 CDT(-0500)] <EricDalquist> not sure what the "best" way to deal with that in git is 
[15:50:04 CDT(-0500)] <EricDalquist> I'll let you know as soon as it is in master so you can start playing with it
[15:50:24 CDT(-0500)] <EricDalquist> Also need to add more events, primarily around the swapper tools and entity CRUD operations
[15:50:33 CDT(-0500)] <athena> sounds good 
[15:50:44 CDT(-0500)] <EricDalquist> ok, off to the bus
[15:50:46 CDT(-0500)] <athena> ttyl
[15:50:48 CDT(-0500)] <EricDalquist> I'll get this merged this evening I hope
[15:50:55 CDT(-0500)] <athena> awesome