Merge pull request #27 from francisco/master

lgtm
Front end changes and removing setinterval until Delmer can help add it back in