11/25/14 First commit after nuking all branches, updated develop with everyone's code