THIS IS TOTALLY BROKEN. DO NOT MERGE!!!!
OK - Wanted to try if travis picks up pull requests here. Now I just need to fix the Travis build..