removed incorrectly placed 'end'
Did stuff.. that i can't rmeember... derp
merging in master