Got autolayout constraints working, preparing to merge with master