Merge pull request #53 from SUNY-Albany-CCI-INF362/master

update from master
cleaned out stuff
that's no moon, that's a lot of cruft i'm cleaning out of the repo
#36 #34 yolo
Merge pull request #54 from SUNY-Albany-CCI-INF362/alp

to close #34 #36