Merging

Changed indexOf by inArray since it's safer to use in older browsers (@leon-anavi)
Bye bye to 4 spaces...