little bit of merge fixing. Closes GH-150
little bit of merge fixing. Closes GH-150

mdissel/Marten,jokokko/marten,tim-cools/Marten,JasperFx/Marten,jamesfarrer/marten,JasperFx/Marten,mysticmind/marten,jokokko/marten,jmbledsoe/marten,jamesfarrer/marten,jokokko/marten,mysticmind/marten,tim-cools/Marten,ericgreenmix/marten,jmbledsoe/marten,mdissel/Marten,ericgreenmix/marten,jmbledsoe/marten,jokokko/marten,mysticmind/marten,jamesfarrer/marten,JasperFx/Marten,ericgreenmix/marten,ericgreenmix/marten,jmbledsoe/marten,jmbledsoe/marten,jokokko/marten,mysticmind/marten,tim-cools/Marten,jamesfarrer/marten