Merge pull request #1 from jamesarosen/master

Merge back changes from main repo
Modify Makefile to check if phantomjs is installed
Merge pull request #27 from cibernox/check_for_phantomjs_in_make

Check for phantomjs in make