Laravel

Merged Laravel branch with master, thereby completing the switch from Django to Laravel