Adding proemsetup to make proem run on every boot up
Added test directory and fixed etc/rc.local.test
Added ison-black locaiton and things
merged conflicts