Added more specs on merging
Added short-circuiting to runtests
Added Travis configuration file