Merge pull request #20 from Parranoia/master

Added .htaccess and modified urls to support the better looking URLs