VLC Play command now does everything except merge playlists.
Merge branch 'master' of https://github.com/natejackels/DisappointingProject

Was changing other files to fix compilation errors locally.