remove bootstrap nonsense for later merge
Merge branch 'master' into biggs
More get methods added
blah
Merge pull request #6 from stuycs-ml7-projects/biggs

Biggs