Merge pull request #6 from cordoval/master

run down and remove bootstrap remainders
upgrade to 2.3