Finish merge

Signed-off-by: rtconner <rtconner@gmail.com>
Merge branch 'master' of github.com:rtconner/laravel-plusplus